forked from mirrors/org-mode
Backport commit 0c856a2 from Emacs master branch
* lisp/ob-core.el (org-babel-check-evaluate) (org-babel-confirm-evaluate): * lisp/ob-fortran.el (org-babel-fortran-var-to-fortran): * lisp/ox-latex.el (org-latex-compile): * lisp/ox-man.el (org-man-compile): * lisp/ox-odt.el (org-odt-template): * lisp/ox-texinfo.el (org-texinfo-compile): Change (message (format ...)) to (message ...), and likewise for ‘error’. This lessens the probability of confusion when the output of ‘format’ contains ‘%’. Fix some confusion with ‘format’ 0c856a2c459016f1f9cce173f5b2b49be36e3452 Paul Eggert Wed Aug 5 19:07:28 2015 -0700
This commit is contained in:
parent
003a0f1069
commit
3a81c7ee6f
|
@ -321,8 +321,8 @@ name of the code block."
|
|||
Do not query the user."
|
||||
(org-babel-check-confirm-evaluate info
|
||||
(not (when noeval
|
||||
(message (format "Evaluation of this%scode-block%sis disabled."
|
||||
code-block block-name))))))
|
||||
(message "Evaluation of this%scode-block%sis disabled."
|
||||
code-block block-name)))))
|
||||
|
||||
;; dynamically scoped for asynchronous export
|
||||
(defvar org-babel-confirm-evaluate-answer-no)
|
||||
|
@ -348,8 +348,8 @@ of potentially harmful code."
|
|||
(yes-or-no-p
|
||||
(format "Evaluate this%scode block%son your system? "
|
||||
code-block block-name)))
|
||||
(message (format "Evaluation of this%scode-block%sis aborted."
|
||||
code-block block-name)))))))
|
||||
(message "Evaluation of this%scode-block%sis aborted."
|
||||
code-block block-name))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun org-babel-execute-safely-maybe ()
|
||||
|
|
|
@ -156,8 +156,7 @@ of the same value."
|
|||
(format "real, parameter :: %S(%d) = %s\n"
|
||||
var (length val) (org-babel-fortran-transform-list val)))
|
||||
(t
|
||||
(error (format "the type of parameter %s is not supported by ob-fortran"
|
||||
var))))))
|
||||
(error "the type of parameter %s is not supported by ob-fortran" var)))))
|
||||
|
||||
(defun org-babel-fortran-transform-list (val)
|
||||
"Return a fortran representation of enclose syntactic lists."
|
||||
|
|
|
@ -3433,7 +3433,7 @@ Return PDF file name or an error if it couldn't be produced."
|
|||
default-directory))
|
||||
(time (current-time))
|
||||
warnings)
|
||||
(unless snippet (message (format "Processing LaTeX file %s..." texfile)))
|
||||
(unless snippet (message "Processing LaTeX file %s..." texfile))
|
||||
(save-window-excursion
|
||||
(cond
|
||||
;; A function is provided: Apply it.
|
||||
|
|
|
@ -1196,7 +1196,7 @@ Return PDF file name or an error if it couldn't be produced."
|
|||
(file-name-directory full-name)
|
||||
default-directory))
|
||||
errors)
|
||||
(message (format "Processing Groff file %s..." file))
|
||||
(message "Processing Groff file %s..." file)
|
||||
(save-window-excursion
|
||||
(cond
|
||||
;; A function is provided: Apply it.
|
||||
|
|
|
@ -1410,8 +1410,8 @@ original parsed data. INFO is a plist holding export options."
|
|||
((member styles-file-type '("odt" "ott"))
|
||||
(org-odt--zip-extract styles-file "styles.xml" org-odt-zip-dir)))))
|
||||
(t
|
||||
(error (format "Invalid specification of styles.xml file: %S"
|
||||
(plist-get info :odt-styles-file)))))
|
||||
(error "Invalid specification of styles.xml file: %S"
|
||||
(plist-get info :odt-styles-file))))
|
||||
|
||||
;; create a manifest entry for styles.xml
|
||||
(org-odt-create-manifest-file-entry "text/xml" "styles.xml")
|
||||
|
|
|
@ -1589,7 +1589,7 @@ Return INFO file name or an error if it couldn't be produced."
|
|||
(file-name-directory full-name)
|
||||
default-directory))
|
||||
errors)
|
||||
(message (format "Processing Texinfo file %s..." file))
|
||||
(message "Processing Texinfo file %s..." file)
|
||||
(save-window-excursion
|
||||
;; Replace %b, %f and %o with appropriate values in each command
|
||||
;; before applying it. Output is redirected to "*Org INFO
|
||||
|
|
Loading…
Reference in a new issue