Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-423

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8806e5c..6aab931 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,12 +5,45 @@
 
        * imap.el (imap-string-to-integer): New function.
 
+2007-12-09  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring.
+
+       * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el:
+       * message.el, mm-view.el, sieve-manage, smime.el:
+       Add declare-function compatibility definition.
+
+       * gnus-art.el (w3-region, w3m-region, Info-menu):
+       * gnus-spec.el (gnus-summary-from-or-to-or-newsgroups):
+       * gnus-sum.el (gnus-get-predicate):
+       * gnus-util.el (mm-append-to-file, w32-focus-frame):
+       * message.el (mail-abbrev-in-expansion-header-p):
+       * mm-view.el (w3-do-setup, w3-region, w3-prepare-buffer)
+       (w3m-detect-meta-charset, w3m-region):
+       * sieve-manage.el (password-read, password-cache-add)
+       (password-cache-remove):
+       * smime.el (password-read-and-add): Declare as functions.
+
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+       * gnus-sum.el (gnus-summary-simplify-subject-query):
+       * ecomplete.el (ecomplete-display-matches): Fix buggy call to
+       `message'.
+
 2007-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el (dgnushack-emacs-compile-defcustom-p): New function; use
        it to bind idna-program, installation-directory, defined-colors, and
        face-attribute for XEmacs of the version that compiles defcustom forms.
 
+2007-12-07  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-art.el (article-make-date-line): Revert previous change.
+
+2007-12-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-start.el (gnus-load): Rename local variable to avoid confusion.
+
 2007-12-06  Christian Plate  <cplate@web.de>  (tiny change)
 
        * nnmaildir.el (nnmaildir-request-update-info): Improved performance.
@@ -23,6 +56,12 @@
        group names with backslashes.  Reported by Tassilo Horn
        <tassilo@member.fsf.org>.
 
+2007-12-06  D. Goel  <deego3@gmail.com>
+
+       * gnus-art.el (article-make-date-line):
+       * gnus-start.el (gnus-load):
+       * pop3.el (pop3-read-response): Fix buggy call to `error'.
+
 2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-use-idna)

diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 42a7591..285aca4 100644 (file)
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -119,7 +119,7 @@
          nil)
       (if (not choose)
          (progn
-           (message matches)
+           (message "%s" matches)
            nil)
        (setq highlight (ecomplete-highlight-match-line matches line))
        (while (not (memq (setq command (read-event highlight)) '(? return)))

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 4bb9ceb..d8f03ff 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -27,6 +27,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 (defvar tool-bar-map)
@@ -2705,6 +2708,9 @@ charset defined in `gnus-summary-show-article-charset-alist' is used."
             (t
              (apply (car func) (cdr func))))))))))
 
+;; External.
+(declare-function w3-region "ext:w3-display" (st nd))
+
 (defun gnus-article-wash-html-with-w3 ()
   "Wash the current buffer with w3."
   (mm-setup-w3)
@@ -2716,6 +2722,9 @@ charset defined in `gnus-summary-show-article-charset-alist' is used."
        (w3-region (point-min) (point-max))
       (error))))
 
+;; External.
+(declare-function w3m-region "ext:w3m" (start end &optional url charset))
+
 (defun gnus-article-wash-html-with-w3m ()
   "Wash the current buffer with emacs-w3m."
   (mm-setup-w3m)
@@ -7682,6 +7691,9 @@ url is put as the `gnus-button-url' overlay property on the button."
   "Fetch KDE style info URL."
   (gnus-info-find-node (gnus-url-unhex-string url)))
 
+;; (info) will autoload info.el
+(declare-function Info-menu "info" (menu-item &optional fork))
+
 (defun gnus-button-handle-info-keystrokes (url)
   "Call `info' when pushing the corresponding URL button."
   ;; For links like `C-h i d m gnus RET', `C-h i d m CC Mode RET'.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index f87377c..5b8bf92 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -27,6 +27,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile (require 'cl))
 (defvar gnus-newsrc-file-version)
 
@@ -87,6 +90,9 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
 (defvar gnus-tmp-header)
 (defvar gnus-tmp-from)
 
+(declare-function gnus-summary-from-or-to-or-newsgroups "gnus-sum"
+                  (header gnus-tmp-from))
+
 (defun gnus-summary-line-format-spec ()
   (insert gnus-tmp-unread gnus-tmp-replied
          gnus-tmp-score-char gnus-tmp-indentation)

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 7d6b913..75f9dda 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2392,11 +2392,11 @@ If FORCE is non-nil, the .newsrc file is read."
            (eval form))
        (error
         (unless (eq (car type) 'end-of-file)
-          (let ((error (format "Error in %s line %d" file
-                               (count-lines (point-min) (point)))))
+          (let ((errmsg (format "Error in %s line %d" file
+                                (count-lines (point-min) (point)))))
             (ding)
-            (unless (gnus-yes-or-no-p (concat error "; continue? "))
-              (error "%s" error)))))))))
+            (unless (gnus-yes-or-no-p (concat errmsg "; continue? "))
+              (error "%s" errmsg)))))))))
 
 (defun gnus-read-newsrc-el-file (file)
   (let ((ding-file (concat file "d")))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index b082a8b..72a7903 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -27,6 +27,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 
@@ -4028,7 +4031,7 @@ If NO-DISPLAY, don't generate a summary buffer."
   "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."
@@ -5576,6 +5579,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
          (gnus-inverse-list-range-intersection
           gnus-newsgroup-articles gnus-newsgroup-seen))))
 
+(declare-function gnus-get-predicate "gnus-agent" (predicate))
+
 (defun gnus-summary-display-make-predicate (display)
   (require 'gnus-agent)
   (when (= (length display) 1)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index de01fb2..8a6e8fa 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -35,6 +35,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 ;; Fixme: this should be a gnus variable, not nnmail-.
@@ -987,6 +990,9 @@ with potentially long computations."
 (defvar rmail-default-rmail-file)
 (defvar mm-text-coding-system)
 
+(declare-function mm-append-to-file "mm-util"
+                  (start end filename &optional codesys inhibit))
+
 (defun gnus-output-to-rmail (filename &optional ask)
   "Append the current article to an Rmail file named FILENAME."
   (require 'rmail)
@@ -1515,6 +1521,8 @@ CHOICE is a list of the choice char and help message at IDX."
        (kill-buffer buf))
     tchar))
 
+(declare-function w32-focus-frame "../term/w32-win" (frame))
+
 (defun gnus-select-frame-set-input-focus (frame)
   "Select FRAME, raise it, and set input focus, if possible."
   (cond ((featurep 'xemacs)

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 3a045c2..82a423b 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1051,7 +1051,7 @@ When called interactively, prompt for REGEXP."
        (unless state
          (push 'middle state))
        (mm-with-unibyte-buffer
-         (insert-buffer gnus-original-article-buffer)
+         (insert-buffer-substring gnus-original-article-buffer)
          (yenc-decode-region (point-min) (point-max))
          (when (and (member 'begin state)
                     (file-exists-p gnus-uu-yenc-article-name))

diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index 503e9d3..36cd17f 100644 (file)
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -49,6 +49,9 @@
 
 ;;; Code:
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (defgroup hashcash nil
   "Hashcash configuration."
   :group 'mail)

diff --git a/lisp/message.el b/lisp/message.el
index 3aaa8c2..919a4c0 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -31,9 +31,11 @@
 
 ;;; Code:
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
-  
+
 (require 'hashcash)
 (require 'canlock)
 (require 'mailheader)
@@ -7474,6 +7476,8 @@ If nil, the function bound in `text-mode-map' or `global-map' is executed."
   :type '(choice (const nil)
                 function))
 
+(declare-function mail-abbrev-in-expansion-header-p "mailabbrev" ())
+
 (defun message-tab ()
   "Complete names according to `message-completion-alist'.
 Execute function specified by `message-tab-body-function' when not in

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index cb4f42d..04e72df 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -24,7 +24,8 @@
 ;;; Commentary:
 
 ;;; Code:
-
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile (require 'cl))
 (require 'mail-parse)
 (require 'mailcap)
@@ -117,6 +118,11 @@
       (defalias 'mm-inline-image 'mm-inline-image-xemacs)
     (defalias 'mm-inline-image 'mm-inline-image-emacs)))
 
+;; External.
+(declare-function w3-do-setup       "ext:w3"         ())
+(declare-function w3-region         "ext:w3-display" (st nd))
+(declare-function w3-prepare-buffer "ext:w3-display" (&rest args))
+
 (defvar mm-w3-setup nil)
 (defun mm-setup-w3 ()
   (unless mm-w3-setup
@@ -201,6 +207,10 @@
 (defvar mm-w3m-setup nil
   "Whether gnus-article-mode has been setup to use emacs-w3m.")
 
+;; External.
+(declare-function w3m-detect-meta-charset "ext:w3m" ())
+(declare-function w3m-region "ext:w3m" (start end &optional url charset))
+
 (defun mm-setup-w3m ()
   "Setup gnus-article-mode to use emacs-w3m."
   (unless mm-w3m-setup

diff --git a/lisp/pop3.el b/lisp/pop3.el
index d152c24..a48e8bc 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -314,7 +314,7 @@ Return the response string if optional second argument is non-nil."
       (setq match-end (point))
       (goto-char pop3-read-point)
       (if (looking-at "-ERR")
-         (error (buffer-substring (point) (- match-end 2)))
+         (error "%s" (buffer-substring (point) (- match-end 2)))
        (if (not (looking-at "+OK"))
            (progn (setq pop3-read-point match-end) nil)
          (setq pop3-read-point match-end)

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 5cf14f7..a4b7636 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -76,6 +76,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (or (require 'password-cache nil t)
     (require 'password))
 (eval-when-compile
@@ -193,6 +196,10 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
   (when (fboundp 'set-buffer-multibyte)
     (set-buffer-multibyte nil)))
 
+(declare-function password-read         "password-cache" (prompt &optional key))
+(declare-function password-cache-add    "password-cache" (key password))
+(declare-function password-cache-remove "password-cache" (key))
+
 ;; Uses the dynamically bound `reason' variable.
 (defvar reason)
 (defun sieve-manage-interactive-login (buffer loginfunc)

diff --git a/lisp/smime.el b/lisp/smime.el
index 31545c1..bd9ce5a 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -121,6 +121,9 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
 (or (require 'password-cache nil t)
     (require 'password))
@@ -257,6 +260,7 @@ must be set in `ldap-host-parameters-alist'."
           temporary-file-directory))))))
 
 ;; Password dialog function
+(declare-function password-read-and-add "password-cache" (prompt &optional key))
 
 (defun smime-ask-passphrase (&optional cache-key)
   "Asks the passphrase to unlock the secret key.