diff options
| author | Paul Eggert | 2015-08-05 19:06:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-08-05 19:07:28 -0700 |
| commit | 0c856a2c459016f1f9cce173f5b2b49be36e3452 (patch) | |
| tree | bbc837053a7255b7e392109fb5680abb8c4513b9 /lisp/org | |
| parent | ec044fd2bfd6257742418d621685017325cb24cc (diff) | |
| download | emacs-0c856a2c459016f1f9cce173f5b2b49be36e3452.tar.gz 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." | |||
| 316 | Do not query the user." | 316 | Do not query the user." |
| 317 | (org-babel-check-confirm-evaluate info | 317 | (org-babel-check-confirm-evaluate info |
| 318 | (not (when noeval | 318 | (not (when noeval |
| 319 | (message (format "Evaluation of this%scode-block%sis disabled." | 319 | (message "Evaluation of this%scode-block%sis disabled." |
| 320 | code-block block-name)))))) | 320 | code-block block-name))))) |
| 321 | 321 | ||
| 322 | ;; dynamically scoped for asynchronous export | 322 | ;; dynamically scoped for asynchronous export |
| 323 | (defvar org-babel-confirm-evaluate-answer-no) | 323 | (defvar org-babel-confirm-evaluate-answer-no) |
| @@ -343,8 +343,8 @@ of potentially harmful code." | |||
| 343 | (yes-or-no-p | 343 | (yes-or-no-p |
| 344 | (format "Evaluate this%scode block%son your system? " | 344 | (format "Evaluate this%scode block%son your system? " |
| 345 | code-block block-name))) | 345 | code-block block-name))) |
| 346 | (message (format "Evaluation of this%scode-block%sis aborted." | 346 | (message "Evaluation of this%scode-block%sis aborted." |
| 347 | code-block block-name))))))) | 347 | code-block block-name)))))) |
| 348 | 348 | ||
| 349 | ;;;###autoload | 349 | ;;;###autoload |
| 350 | (defun org-babel-execute-safely-maybe () | 350 | (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." | |||
| 147 | ;; val is a matrix | 147 | ;; val is a matrix |
| 148 | ((and (listp val) (org-every #'listp val)) | 148 | ((and (listp val) (org-every #'listp val)) |
| 149 | (format "real, parameter :: %S(%d,%d) = transpose( reshape( %s , (/ %d, %d /) ) )\n" | 149 | (format "real, parameter :: %S(%d,%d) = transpose( reshape( %s , (/ %d, %d /) ) )\n" |
| 150 | var (length val) (length (car val)) | 150 | var (length val) (length (car val)) |
| 151 | (org-babel-fortran-transform-list val) | 151 | (org-babel-fortran-transform-list val) |
| 152 | (length (car val)) (length val))) | 152 | (length (car val)) (length val))) |
| 153 | ((listp val) | 153 | ((listp val) |
| 154 | (format "real, parameter :: %S(%d) = %s\n" | 154 | (format "real, parameter :: %S(%d) = %s\n" |
| 155 | var (length val) (org-babel-fortran-transform-list val))) | 155 | var (length val) (org-babel-fortran-transform-list val))) |
| 156 | (t | 156 | (t |
| 157 | (error (format "the type of parameter %s is not supported by ob-fortran" | 157 | (error "the type of parameter %s is not supported by ob-fortran" var))))) |
| 158 | var)))))) | ||
| 159 | 158 | ||
| 160 | (defun org-babel-fortran-transform-list (val) | 159 | (defun org-babel-fortran-transform-list (val) |
| 161 | "Return a fortran representation of enclose syntactic lists." | 160 | "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." | |||
| 2846 | (file-name-directory full-name) | 2846 | (file-name-directory full-name) |
| 2847 | default-directory)) | 2847 | default-directory)) |
| 2848 | errors) | 2848 | errors) |
| 2849 | (unless snippet (message (format "Processing LaTeX file %s..." texfile))) | 2849 | (unless snippet (message "Processing LaTeX file %s..." texfile)) |
| 2850 | (save-window-excursion | 2850 | (save-window-excursion |
| 2851 | (cond | 2851 | (cond |
| 2852 | ;; A function is provided: Apply it. | 2852 | ;; 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." | |||
| 1190 | (file-name-directory full-name) | 1190 | (file-name-directory full-name) |
| 1191 | default-directory)) | 1191 | default-directory)) |
| 1192 | errors) | 1192 | errors) |
| 1193 | (message (format "Processing Groff file %s..." file)) | 1193 | (message "Processing Groff file %s..." file) |
| 1194 | (save-window-excursion | 1194 | (save-window-excursion |
| 1195 | (cond | 1195 | (cond |
| 1196 | ;; A function is provided: Apply it. | 1196 | ;; 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." | |||
| 1389 | ((member styles-file-type '("odt" "ott")) | 1389 | ((member styles-file-type '("odt" "ott")) |
| 1390 | (org-odt--zip-extract styles-file "styles.xml" org-odt-zip-dir))))) | 1390 | (org-odt--zip-extract styles-file "styles.xml" org-odt-zip-dir))))) |
| 1391 | (t | 1391 | (t |
| 1392 | (error (format "Invalid specification of styles.xml file: %S" | 1392 | (error "Invalid specification of styles.xml file: %S" |
| 1393 | org-odt-styles-file)))) | 1393 | org-odt-styles-file))) |
| 1394 | 1394 | ||
| 1395 | ;; create a manifest entry for styles.xml | 1395 | ;; create a manifest entry for styles.xml |
| 1396 | (org-odt-create-manifest-file-entry "text/xml" "styles.xml") | 1396 | (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." | |||
| 1513 | (file-name-directory full-name) | 1513 | (file-name-directory full-name) |
| 1514 | default-directory)) | 1514 | default-directory)) |
| 1515 | errors) | 1515 | errors) |
| 1516 | (message (format "Processing Texinfo file %s..." file)) | 1516 | (message "Processing Texinfo file %s..." file) |
| 1517 | (save-window-excursion | 1517 | (save-window-excursion |
| 1518 | ;; Replace %b, %f and %o with appropriate values in each command | 1518 | ;; Replace %b, %f and %o with appropriate values in each command |
| 1519 | ;; before applying it. Output is redirected to "*Org INFO | 1519 | ;; before applying it. Output is redirected to "*Org INFO |