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/progmodes | |
| parent | ec044fd2bfd6257742418d621685017325cb24cc (diff) | |
| download | emacs-0c856a2c459016f1f9cce173f5b2b49be36e3452.tar.gz | |
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/progmodes')
| -rw-r--r-- | lisp/progmodes/prolog.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 2d95345b531..b95c3f97117 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -2305,7 +2305,7 @@ In effect it sets the `fill-prefix' when inside comments and then calls (pop-to-buffer nil) (Info-goto-node prolog-info-predicate-index) (if (not (re-search-forward str nil t)) - (error (format "Help on predicate `%s' not found." predicate))) + (error "Help on predicate `%s' not found." predicate)) (setq oldp (point)) (if (re-search-forward str nil t) @@ -2975,7 +2975,7 @@ Return the final point or nil if no such a beginning was found." (let* ((pinfo (prolog-clause-info)) (predname (nth 0 pinfo)) (arity (nth 1 pinfo))) - (message (format "%s/%d" predname arity)))) + (message "%s/%d" predname arity))) (defun prolog-insert-predicate-template () "Insert the template for the current clause." diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 21ad1021c9e..5d59a56e858 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1178,9 +1178,7 @@ delimiter." (setq in-string (match-end 0)) (goto-char ruby-indent-point))) (t - (error (format "Bad string %s" - (buffer-substring (point) pnt) - )))))) + (error "Bad string %s" (buffer-substring (point) pnt)))))) (list in-string nest depth pcol)) (defun ruby-parse-region (start end) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 11b7561c99a..4fc4b03688f 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -7533,7 +7533,7 @@ If search fails, other files are checked based on (regexp "\\(module\\s-+\\w+\\s-*(\\)\\|\\(\\w+\\s-+\\w+\\s-*(\\)")) (with-output-to-temp-buffer "*Occur*" (save-excursion - (message (format "Searching for %s ..." regexp)) + (message "Searching for %s ..." regexp) ;; Find next match, but give up if prev match was at end of buffer. (while (and (not (= prevpos (point-max))) (verilog-re-search-forward regexp nil t)) |