Patches from SANETO-san.

* gnus.el (gnus-revision-number): Increment to 04.

* gnus-spec.el: Call `gnus-ems-redefine'.

* pop3.el (pop3-movemail): Don't use `format' for `message'.
* gnus-offline.el (gnus-offline-toggle-articles-to-fetch): Ditto.

* read-passwd.el (read-pw-read-noecho): Use "%s" for the 1st arg of `message'.
* gnus.el (gnus-version): Ditto.
* gnus-sum.el (gnus-summary-simplify-subject-query): Ditto.
* gnus-offline.el (gnus-offline-set-interval-time, gnus-offline-empting-spool,
gnus-offline-toggle-on/off-send-mail, gnus-offline-set-auto-ppp,
gnus-offline-after-jobs-done, gnus-offline-hangup-line,
gnus-offline-get-new-news-function, gnus-offline-connect-server): Ditto.
* dgnushack.el (dgnushack-make-package): Ditto.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 9c44e22..94ef291 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -269,7 +269,7 @@ Modify to suit your needs."))
     (with-temp-buffer
       (let ((standard-output (current-buffer)))
        (Custom-make-dependencies "."))
-      (message (buffer-string)))
+      (message "%s" (buffer-string)))
     (require 'cus-load)
     (byte-compile-file "custom-load.el")
 

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index f9bc3eb..76f4ac2 100644 (file)
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -486,11 +486,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; Dialup if gnus-offline-dialup-program is specified
   (if (stringp gnus-offline-dialup-program)
       (progn
-       (message (gnus-offline-gettext 'connect-server-1))
+       (message "%s" (gnus-offline-gettext 'connect-server-1))
        (apply 'call-process gnus-offline-dialup-program nil nil nil
               gnus-offline-dialup-program-arguments)
        (sleep-for 1)
-       (message (gnus-offline-gettext 'connect-server-2)))))
+       (message "%s" (gnus-offline-gettext 'connect-server-2)))))
 
 ;;
 ;; Jobs before get new news , send mail and post news.
@@ -507,7 +507,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; Set send mail/news functions to online functions.
   (gnus-offline-set-online-sendmail-function)
   (gnus-offline-set-online-post-news-function)
-  (message (gnus-offline-gettext 'get-new-news-function-1))
+  (message "%s" (gnus-offline-gettext 'get-new-news-function-1))
 
   ;; fetch only news
   (if (eq gnus-offline-articles-to-fetch 'news)
@@ -652,11 +652,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 ;;
 (defun gnus-offline-hangup-line ()
   "*Hangup line function."
-  (message (gnus-offline-gettext 'hangup-line-1))
+  (message "%s" (gnus-offline-gettext 'hangup-line-1))
   (if (stringp gnus-offline-hangup-program)
       (apply 'start-process "hup" nil gnus-offline-hangup-program
             gnus-offline-hangup-program-arguments))
-  (message (gnus-offline-gettext 'hangup-line-2)))
+  (message "%s" (gnus-offline-gettext 'hangup-line-2)))
 ;;
 ;; Hang Up line routine whe using nnspool
 ;;
@@ -680,7 +680,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
       (ding nil 'drum)
     (ding))
   (gnus-group-save-newsrc)
-  (message (gnus-offline-gettext 'after-jobs-done-1)))
+  (message "%s" (gnus-offline-gettext 'after-jobs-done-1)))
 
 \f
 ;;
@@ -702,17 +702,20 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
                        '((set-auto-ppp-menu-1
                           (progn
                             (setq gnus-offline-auto-ppp '(connect disconnect))
-                            (message (gnus-offline-gettext 'set-auto-ppp-1)))
+                            (message "%s"
+                                     (gnus-offline-gettext 'set-auto-ppp-1)))
                           t)
                          (set-auto-ppp-menu-2
                           (progn
                             (setq gnus-offline-auto-ppp '(connect))
-                            (message (gnus-offline-gettext 'set-auto-ppp-2)))
+                            (message "%s"
+                                     (gnus-offline-gettext 'set-auto-ppp-2)))
                           t)
                          (set-auto-ppp-menu-3
                           (progn
                             (setq gnus-offline-auto-ppp nil)
-                            (message (gnus-offline-gettext 'set-auto-ppp-3)))
+                            (message "%s"
+                                     (gnus-offline-gettext 'set-auto-ppp-3)))
                           t)))))
           (gnus-offline-popup menu title))
          (t
@@ -728,7 +731,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
                         (setq gnus-offline-auto-ppp nil)
                         (setq str
                               (gnus-offline-gettext 'set-auto-ppp-3))))))
-          (message str)))))
+          (message "%s" str)))))
 ;;
 ;; Toggle offline/online to send mail.
 ;;
@@ -740,11 +743,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
        ;; Sending mail under online environ.
        (gnus-offline-set-online-sendmail-function)
        (setq gnus-offline-mail-treat-environ 'online)
-       (message (gnus-offline-gettext 'toggle-on/off-send-mail-1)))
+       (message "%s" (gnus-offline-gettext 'toggle-on/off-send-mail-1)))
     ;; Sending mail under offline environ.
     (gnus-offline-set-offline-sendmail-function)
     (setq gnus-offline-mail-treat-environ 'offline)
-    (message (gnus-offline-gettext 'toggle-on/off-send-mail-2))))
+    (message "%s" (gnus-offline-gettext 'toggle-on/off-send-mail-2))))
 ;;
 ;; Toggle articles to fetch ... both -> mail -> news -> both
 ;;
@@ -762,7 +765,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
          (t
           (setq gnus-offline-articles-to-fetch 'both
                 str (gnus-offline-gettext 'toggle-articles-to-fetch-4))))
-    (message (format "%s %s" string str))))
+    (message "%s %s" string str)))
 ;;
 ;; Send mail and Post news using Miee or gnus-agent.
 ;;
@@ -774,11 +777,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
       (progn
        (if (eq gnus-offline-mail-treat-environ 'offline)
            (progn
-             (message (gnus-offline-gettext 'empting-spool-1))
+             (message "%s" (gnus-offline-gettext 'empting-spool-1))
              ;; Using miee to send mail.
              (mail-spool-send)
-             (message (gnus-offline-gettext 'empting-spool-2))))
-       (message (gnus-offline-gettext 'empting-spool-3))
+             (message "%s" (gnus-offline-gettext 'empting-spool-2))))
+       (message "%s" (gnus-offline-gettext 'empting-spool-3))
        ;; Using miee to post news.
        (if (and (not (stringp msspool-news-server))
                 (not msspool-news-service))
@@ -786,11 +789,11 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
              (setq msspool-news-server (nth 1 gnus-select-method))
              (setq msspool-news-service 119)))
        (news-spool-post)
-       (message (gnus-offline-gettext 'empting-spool-4)))
+       (message "%s" (gnus-offline-gettext 'empting-spool-4)))
     ;; Send queued message by gnus-agent
-    (message (gnus-offline-gettext 'empting-spool-5))
+    (message "%s" (gnus-offline-gettext 'empting-spool-5))
     (gnus-group-send-drafts)
-    (message (gnus-offline-gettext 'empting-spool-6)))
+    (message "%s" (gnus-offline-gettext 'empting-spool-6)))
   ;;
   (run-hooks 'gnus-offline-after-empting-spool-hook))
 ;;
@@ -806,7 +809,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
                        nil)))
   (if (< gnus-offline-interval-time 2)
       (progn
-       (message (gnus-offline-gettext 'interval-time-2))
+       (message "%s" (gnus-offline-gettext 'interval-time-2))
        (setq gnus-offline-interval-time 0))
     (message
      (format (gnus-offline-gettext 'interval-time-3)

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 7f35c76..52f594e 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -563,6 +563,8 @@ If PROPS, insert the result."
        (symbol-value (intern (format "gnus-%s-line-format-alist" type)))
        insertable)))
 
+(gnus-ems-redefine)
+
 (provide 'gnus-spec)
 
 ;; Local Variables:

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 82e9ee2..e62cf6b 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2995,7 +2995,8 @@ If SHOW-ALL is non-nil, already read articles are also listed."
   "Query where the respool algorithm would put this article."
   (interactive)
   (gnus-summary-select-article)
-  (message (gnus-general-simplify-subject (gnus-summary-article-subject))))
+  (message "%s"
+          (gnus-general-simplify-subject (gnus-summary-article-subject))))
 
 (defun gnus-gather-threads-by-subject (threads)
   "Gather threads by looking at Subject headers."

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 4f0573b..6de24a2 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -268,7 +268,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.14.1"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "03"
+(defconst gnus-revision-number "04"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "5.8.3"
@@ -2112,8 +2112,8 @@ STRINGS will be evaluated in normal `or' order."
 If ARG, insert string at point."
   (interactive "P")
   (if arg
-      (insert (message gnus-version))
-    (message gnus-version)))
+      (insert (message "%s" gnus-version))
+    (message "%s" gnus-version)))
 
 (defun gnus-continuum-version (version)
   "Return VERSION as a floating point number."

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 24ea4e5..7063fa9 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -126,8 +126,8 @@ Nil means no, t means yes, not-nil-or-t means yet to be determined.")
     (message "Retrieving message list...")
     (setq messages (pop3-get-message-numbers process)
          message-count (length (cdr messages)))
-    (message (format "Retrieving message list...%d of %d unread"
-                    message-count (pop messages)))
+    (message "Retrieving message list...%d of %d unread"
+            message-count (pop messages))
     (unwind-protect
        (unless (not (stringp crashbox))
          (while messages
@@ -148,8 +148,8 @@ Nil means no, t means yes, not-nil-or-t means yet to be determined.")
          ;; now delete the messages we have retrieved
          (unless pop3-leave-mail-on-server
            (dolist (n retrieved-messages)
-             (message (format "Deleting message %d of %d from %s..."
-                              n message-count pop3-mailhost))
+             (message "Deleting message %d of %d from %s..."
+                      n message-count pop3-mailhost)
              (pop3-dele process n)))
          )
       (pop3-quit process))

diff --git a/lisp/read-passwd.el b/lisp/read-passwd.el
index ae7a239..4542604 100644 (file)
--- a/lisp/read-passwd.el
+++ b/lisp/read-passwd.el
@@ -64,7 +64,7 @@ Argument PROMPT ."
              (1+ (- (length msg) (window-width (minibuffer-window)))))
        (and (> truncate 0)
             (setq msg (concat "$" (substring msg (1+ truncate))))))
-      (message msg)
+      (message "%s" msg)
       (setq c (read-pw-read-char-exclusive))
       (cond ((eq ?\C-g c)
             (setq quit-flag t