diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-05 19:06:57 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-05 19:07:28 -0700 |
commit | 0c856a2c459016f1f9cce173f5b2b49be36e3452 (patch) | |
tree | bbc837053a7255b7e392109fb5680abb8c4513b9 /lisp/org | |
parent | ec044fd2bfd6257742418d621685017325cb24cc (diff) | |
download | emacs-0c856a2c459016f1f9cce173f5b2b49be36e3452.tar.gz emacs-0c856a2c459016f1f9cce173f5b2b49be36e3452.tar.bz2 emacs-0c856a2c459016f1f9cce173f5b2b49be36e3452.zip |
Fix some confusion with ‘format’
* lisp/allout-widgets.el (allout-widgets-before-change-handler)
(allout-graphics-modification-handler):
Protect arbitrary string in a format context with "%s" format.
* lisp/avoid.el:
* lisp/cedet/semantic/bovine/scm.el: Fix comment.
* lisp/calendar/icalendar.el (icalendar--convert-sexp-to-ical):
* lisp/erc/erc-button.el (erc-button-beats-to-time):
* lisp/gnus/message.el (message-send-form-letter):
* lisp/org/ob-core.el (org-babel-check-evaluate)
(org-babel-confirm-evaluate):
* lisp/org/ob-fortran.el (org-babel-fortran-var-to-fortran):
* lisp/org/ox-latex.el (org-latex-compile):
* lisp/org/ox-man.el (org-man-compile):
* lisp/org/ox-odt.el (org-odt-template):
* lisp/org/ox-texinfo.el (org-texinfo-compile):
* lisp/progmodes/prolog.el (prolog-help-info)
(prolog-view-predspec):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial):
* lisp/progmodes/verilog-mode.el (verilog-showscopes):
* lisp/textmodes/rst.el (rst-replace-lines):
Change (message (format ...)) to (message ...), and likewise
for ‘error’. This lessens the probability of confusion when the
output of ‘format’ contains ‘%’.
Diffstat (limited to 'lisp/org')
-rw-r--r-- | lisp/org/ob-core.el | 8 | ||||
-rw-r--r-- | lisp/org/ob-fortran.el | 5 | ||||
-rw-r--r-- | lisp/org/ox-latex.el | 2 | ||||
-rw-r--r-- | lisp/org/ox-man.el | 2 | ||||
-rw-r--r-- | lisp/org/ox-odt.el | 4 | ||||
-rw-r--r-- | lisp/org/ox-texinfo.el | 2 |
6 files changed, 11 insertions, 12 deletions
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index f767a4eabe1..bb46267c006 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -316,8 +316,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) @@ -343,8 +343,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 () diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el index 7fbfaf2bc37..30b5350767f 100644 --- a/lisp/org/ob-fortran.el +++ b/lisp/org/ob-fortran.el @@ -147,15 +147,14 @@ of the same value." ;; val is a matrix ((and (listp val) (org-every #'listp val)) (format "real, parameter :: %S(%d,%d) = transpose( reshape( %s , (/ %d, %d /) ) )\n" - var (length val) (length (car val)) + var (length val) (length (car val)) (org-babel-fortran-transform-list val) (length (car val)) (length val))) ((listp val) (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." diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index 98023a472b5..bfc860a46bc 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -2846,7 +2846,7 @@ Return PDF file name or an error if it couldn't be produced." (file-name-directory full-name) default-directory)) errors) - (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. diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el index 2b8348f66ef..8b4ddc7e651 100644 --- a/lisp/org/ox-man.el +++ b/lisp/org/ox-man.el @@ -1190,7 +1190,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. diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index f1ef90e169b..a0281420317 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -1389,8 +1389,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" - org-odt-styles-file)))) + (error "Invalid specification of styles.xml file: %S" + org-odt-styles-file))) ;; create a manifest entry for styles.xml (org-odt-create-manifest-file-entry "text/xml" "styles.xml") diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el index 26f58ad662a..c77a239dc3f 100644 --- a/lisp/org/ox-texinfo.el +++ b/lisp/org/ox-texinfo.el @@ -1513,7 +1513,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 |