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/progmodes | |
| 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/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 | |||
| 2305 | (pop-to-buffer nil) | 2305 | (pop-to-buffer nil) |
| 2306 | (Info-goto-node prolog-info-predicate-index) | 2306 | (Info-goto-node prolog-info-predicate-index) |
| 2307 | (if (not (re-search-forward str nil t)) | 2307 | (if (not (re-search-forward str nil t)) |
| 2308 | (error (format "Help on predicate `%s' not found." predicate))) | 2308 | (error "Help on predicate `%s' not found." predicate)) |
| 2309 | 2309 | ||
| 2310 | (setq oldp (point)) | 2310 | (setq oldp (point)) |
| 2311 | (if (re-search-forward str nil t) | 2311 | (if (re-search-forward str nil t) |
| @@ -2975,7 +2975,7 @@ Return the final point or nil if no such a beginning was found." | |||
| 2975 | (let* ((pinfo (prolog-clause-info)) | 2975 | (let* ((pinfo (prolog-clause-info)) |
| 2976 | (predname (nth 0 pinfo)) | 2976 | (predname (nth 0 pinfo)) |
| 2977 | (arity (nth 1 pinfo))) | 2977 | (arity (nth 1 pinfo))) |
| 2978 | (message (format "%s/%d" predname arity)))) | 2978 | (message "%s/%d" predname arity))) |
| 2979 | 2979 | ||
| 2980 | (defun prolog-insert-predicate-template () | 2980 | (defun prolog-insert-predicate-template () |
| 2981 | "Insert the template for the current clause." | 2981 | "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." | |||
| 1178 | (setq in-string (match-end 0)) | 1178 | (setq in-string (match-end 0)) |
| 1179 | (goto-char ruby-indent-point))) | 1179 | (goto-char ruby-indent-point))) |
| 1180 | (t | 1180 | (t |
| 1181 | (error (format "Bad string %s" | 1181 | (error "Bad string %s" (buffer-substring (point) pnt)))))) |
| 1182 | (buffer-substring (point) pnt) | ||
| 1183 | )))))) | ||
| 1184 | (list in-string nest depth pcol)) | 1182 | (list in-string nest depth pcol)) |
| 1185 | 1183 | ||
| 1186 | (defun ruby-parse-region (start end) | 1184 | (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 | |||
| 7533 | (regexp "\\(module\\s-+\\w+\\s-*(\\)\\|\\(\\w+\\s-+\\w+\\s-*(\\)")) | 7533 | (regexp "\\(module\\s-+\\w+\\s-*(\\)\\|\\(\\w+\\s-+\\w+\\s-*(\\)")) |
| 7534 | (with-output-to-temp-buffer "*Occur*" | 7534 | (with-output-to-temp-buffer "*Occur*" |
| 7535 | (save-excursion | 7535 | (save-excursion |
| 7536 | (message (format "Searching for %s ..." regexp)) | 7536 | (message "Searching for %s ..." regexp) |
| 7537 | ;; Find next match, but give up if prev match was at end of buffer. | 7537 | ;; Find next match, but give up if prev match was at end of buffer. |
| 7538 | (while (and (not (= prevpos (point-max))) | 7538 | (while (and (not (= prevpos (point-max))) |
| 7539 | (verilog-re-search-forward regexp nil t)) | 7539 | (verilog-re-search-forward regexp nil t)) |