Mercurial > emacs
changeset 65584:6dbba0bd58df
Message format fixes, commit no. 3
author | Deepak Goel <deego@gnufans.org> |
---|---|
date | Sun, 18 Sep 2005 12:31:28 +0000 |
parents | 703495630901 |
children | 6d0d4d973f77 |
files | lisp/progmodes/ada-mode.el lisp/progmodes/ada-xref.el lisp/progmodes/cmacexp.el lisp/progmodes/ebnf2ps.el lisp/progmodes/flymake.el lisp/progmodes/gud.el lisp/progmodes/idlw-shell.el lisp/progmodes/idlwave.el lisp/progmodes/ps-mode.el lisp/progmodes/sh-script.el lisp/progmodes/vhdl-mode.el |
diffstat | 11 files changed, 38 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/ada-mode.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/ada-mode.el Sun Sep 18 12:31:28 2005 +0000 @@ -1539,7 +1539,7 @@ (ada-save-exceptions-to-file file-name) - (message (concat "Defining " word " as a casing exception")))) + (message "%s" (concat "Defining " word " as a casing exception")))) (defun ada-case-read-exceptions-from-file (file-name) "Read the content of the casing exception file FILE-NAME." @@ -2191,17 +2191,17 @@ (if (equal (cdr cur-indent) '(0)) (message (concat "same indentation as line " (number-to-string line))) - (message (mapconcat (lambda(x) - (cond - ((symbolp x) - (symbol-name x)) - ((numberp x) - (number-to-string x)) - ((listp x) - (concat "- " (symbol-name (cadr x)))) - )) - (cdr cur-indent) - " + ")))) + (message "%s" (mapconcat (lambda(x) + (cond + ((symbolp x) + (symbol-name x)) + ((numberp x) + (number-to-string x)) + ((listp x) + (concat "- " (symbol-name (cadr x)))) + )) + (cdr cur-indent) + " + ")))) (save-excursion (goto-char (car cur-indent)) (sit-for 1)))) @@ -2214,7 +2214,7 @@ (while command-line-args-left (let ((source (car command-line-args-left))) - (message (concat "formating " source)) + (message "Formating %s" source) (find-file source) (ada-indent-region (point-min) (point-max)) (ada-adjust-case-buffer)
--- a/lisp/progmodes/ada-xref.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/ada-xref.el Sun Sep 18 12:31:28 2005 +0000 @@ -325,7 +325,7 @@ ;; Check if there is an environment variable with the same name (if (null value) (if (not (setq value (getenv name))) - (message (concat "No environment variable " name " found")))) + (message "%s" (concat "No environment variable " name " found")))) (cond ((null value)
--- a/lisp/progmodes/cmacexp.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/cmacexp.el Sun Sep 18 12:31:28 2005 +0000 @@ -346,13 +346,13 @@ (format "\n#line %d \"%s\"\n" startlinenum filename))) ;; Call the preprocessor. - (if display (message mymsg)) + (if display (message "%s" mymsg)) (setq exit-status (call-process-region 1 (point-max) shell-file-name t (list t tempname) nil "-c" cppcommand)) - (if display (message (concat mymsg "done"))) + (if display (message "%s" (concat mymsg "done"))) (if (= (buffer-size) 0) ;; Empty output is normal after a fatal error. (insert "\nPreprocessor produced no output\n")
--- a/lisp/progmodes/ebnf2ps.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/ebnf2ps.el Sun Sep 18 12:31:28 2005 +0000 @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/11/19 22:30:34 vinicius> +;; Time-stamp: <2005-09-18 07:27:20 deego> ;; Keywords: wp, ebnf, PostScript ;; Version: 4.2 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ @@ -4674,7 +4674,7 @@ (goto-char the-point) (if ebnf-stop-on-error (error error-msg) - (message error-msg))) + (message "%s" error-msg))) ;; generated output OK (gen-func nil)
--- a/lisp/progmodes/flymake.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/flymake.el Sun Sep 18 12:31:28 2005 +0000 @@ -183,7 +183,7 @@ are the string substitutions (see `format')." (if (<= level flymake-log-level) (let* ((msg (apply 'format text args))) - (message msg) + (message "%s" msg) ;;(with-temp-buffer ;; (insert msg) ;; (insert "\n")
--- a/lisp/progmodes/gud.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/gud.el Sun Sep 18 12:31:28 2005 +0000 @@ -1865,7 +1865,7 @@ ;; Anything else means the input is invalid. (t - (message (format "Error parsing file %s." file)) + (message "Error parsing file %s." file) (throw 'abort nil)))))) l))
--- a/lisp/progmodes/idlw-shell.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/idlw-shell.el Sun Sep 18 12:31:28 2005 +0000 @@ -2263,7 +2263,7 @@ (idlwave-shell-display-line (nth idlwave-shell-calling-stack-index stack) nil (unless idlwave-shell-electric-debug-mode 'no-debug)) - (message (or message + (message "%s" (or message (format "In routine %s (stack level %d)" idlwave-shell-calling-stack-routine (- idlwave-shell-calling-stack-index))))))
--- a/lisp/progmodes/idlwave.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/idlwave.el Sun Sep 18 12:31:28 2005 +0000 @@ -3995,7 +3995,7 @@ ;; Call etags (if (not (string-match "^[ \\t]*$" item)) (progn - (message (concat "Tagging " item "...")) + (message "%s" (concat "Tagging " item "...")) (setq errbuf (get-buffer-create "*idltags-error*")) (setq status (+ status (if (eq 0 (call-process @@ -5188,7 +5188,7 @@ message-base (not (string= idlwave-library-catalog-libname old-libname))) - (message (concat message-base + (message "%s" (concat message-base idlwave-library-catalog-libname)) (setq old-libname idlwave-library-catalog-libname)) (when idlwave-library-catalog-routines
--- a/lisp/progmodes/ps-mode.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/ps-mode.el Sun Sep 18 12:31:28 2005 +0000 @@ -630,7 +630,7 @@ (current-column)) (error (ding) - (message (error-message-string err)) + (message "%s" (error-message-string err)) 0)) (let (target) (if (not (re-search-backward "[^ \t\n\r\f][ \t\n\r\f]*\\=" nil t))
--- a/lisp/progmodes/sh-script.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/sh-script.el Sun Sep 18 12:31:28 2005 +0000 @@ -2572,9 +2572,9 @@ (if (numberp blinkpos) (save-excursion (goto-char blinkpos) - (message msg) + (if msg (message "%s" msg) (message nil)) (sit-for blink-matching-delay)) - (message msg))) + (if message (message "%s" msg) (message nil)))) (defun sh-show-indent (arg) "Show the how the currently line would be indented. @@ -2591,7 +2591,7 @@ (curr-indent (current-indentation)) val msg) (if (stringp var) - (message (setq msg var)) + (message "%s" (setq msg var)) (setq val (sh-calculate-indent info)) (if (eq curr-indent val) @@ -2610,8 +2610,8 @@ (if (and info (listp (car info)) (eq (car (car info)) t)) (sh-blink (nth 1 (car info)) msg) - (message msg))) - (message msg)) + (message "%s" msg))) + (message "%s" msg)) )) (defun sh-set-indent () @@ -2624,7 +2624,7 @@ (var (sh-get-indent-var-for-line info)) val old-val indent-val) (if (stringp var) - (message (format "Cannot set indent - %s" var)) + (message "Cannot set indent - %s" var) (setq old-val (symbol-value var)) (setq val (sh-read-variable var)) (condition-case nil @@ -2675,7 +2675,7 @@ (curr-indent (current-indentation))) (cond ((stringp var) - (message (format "Cannot learn line - %s" var))) + (message "Cannot learn line - %s" var)) ((eq var 'sh-indent-comment) ;; This is arbitrary... ;; - if curr-indent is 0, set to curr-indent
--- a/lisp/progmodes/vhdl-mode.el Sun Sep 18 12:28:30 2005 +0000 +++ b/lisp/progmodes/vhdl-mode.el Sun Sep 18 12:31:28 2005 +0000 @@ -2157,7 +2157,7 @@ (defun vhdl-warning (string &optional nobeep) "Print out warning STRING and beep." - (message (concat "WARNING: " string)) + (message "WARNING: %s" string) (unless (or nobeep noninteractive) (beep))) (defun vhdl-print-warnings () @@ -2165,7 +2165,7 @@ (let ((no-warnings (length vhdl-warnings))) (setq vhdl-warnings (nreverse vhdl-warnings)) (while vhdl-warnings - (message (concat "WARNING: " (car vhdl-warnings))) + (message "WARNING: %s" (car vhdl-warnings)) (setq vhdl-warnings (cdr vhdl-warnings))) (beep) (when (> no-warnings 1) @@ -10605,7 +10605,7 @@ (vhdl-template-invoked-by-hook t)) (let ((caught (catch 'abort (funcall func)))) - (when (stringp caught) (message caught))) + (when (stringp caught) (message "%s" caught))) (when (= invoke-char ?-) (setq abbrev-start-location (point))) ;; delete CR which is still in event queue (if (fboundp 'enqueue-eval-event) @@ -10768,7 +10768,7 @@ (defun vhdl-template-insert-fun (fun) "Call FUN to insert a built-in template." (let ((caught (catch 'abort (when fun (funcall fun))))) - (when (stringp caught) (message caught)))) + (when (stringp caught) (message "%s" caught)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -11695,7 +11695,7 @@ (setq arch-buffer (current-buffer)) (when ent-buffer (set-buffer ent-buffer) (save-buffer)) (set-buffer arch-buffer) (save-buffer)) - (message + (message "%s" (concat (format "Pasting port as testbench \"%s(%s)\"...done" ent-name arch-name) (and ent-file-name @@ -15498,7 +15498,7 @@ (setq arch-buffer (current-buffer)) (when ent-buffer (set-buffer ent-buffer) (save-buffer)) (set-buffer arch-buffer) (save-buffer) - (message + (message "%s" (concat (format "Creating component \"%s(%s)\"...done" ent-name arch-name) (and ent-file-name (format "\n File created: \"%s\"" ent-file-name)) @@ -16120,7 +16120,7 @@ (vhdl-template-footer) (vhdl-comment-display-line) (insert "\n")) (save-buffer)) - (message + (message "%s" (concat (format "Generating configuration \"%s\"...done" conf-name) (and conf-file-name (format "\n File created: \"%s\"" conf-file-name))))))