Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e041db..94efb5e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-29 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-agent.el (gnus-agent-write-active): Make sure sym is a cons
+       of integers.
+
+2001-11-29  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * message.el (message-newgroups-header-regexp)
+       (message-completion-alist, message-tab-body-function): Use
+       defcustom rather than defvar.
+       (message-tab): Mention `message-tab-body-function' in doc.
+       Suggested by Karl Eichwalder.
+
 2001-11-28 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-uu.el (gnus-uu-save-article): Use #part instead of #mml.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index a7bb8c8..2d4cd5c 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -754,9 +754,12 @@ the actual number of articles toggled is returned."
         (when (and sym (boundp sym))
           (if (and (boundp (setq osym (intern (symbol-name sym) orig)))
                    (setq elem (symbol-value osym)))
-              (if (> (car elem) (car (symbol-value sym)))
-                  (setcar elem (car (symbol-value sym)))
-                (setcdr elem (cdr (symbol-value sym))))
+              (progn
+                (if (and (integerp (car (symbol-value sym)))
+                         (> (car elem) (car (symbol-value sym))))
+                    (setcar elem (car (symbol-value sym))))
+                (if (integerp (cdr (symbol-value sym)))
+                    (setcdr elem (cdr (symbol-value sym)))))
             (set (intern (symbol-name sym) orig) (symbol-value sym)))))
        new))
     (gnus-make-directory (file-name-directory file))

diff --git a/lisp/message.el b/lisp/message.el
index d877e9f..5844040 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5910,21 +5910,28 @@ which specify the range to operate on."
 
 ;;; Group name completion.
 
-(defvar message-newgroups-header-regexp
+(defcustom message-newgroups-header-regexp
   "^\\(Newsgroups\\|Followup-To\\|Posted-To\\|Gcc\\):"
-  "Regexp that match headers that lists groups.")
+  "Regexp that match headers that lists groups."
+  :group 'message
+  :type 'regexp)
 
-(defvar message-completion-alist
+(defcustom message-completion-alist
   (list (cons message-newgroups-header-regexp 'message-expand-group)
        '("^\\(Resent-\\)?\\(To\\|B?Cc\\):" . message-expand-name))
-  "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE.")
+  "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE."
+  :group 'message
+  :type '(alist :key-type regexp :value-type function))
 
-(defvar message-tab-body-function 'indent-relative
-  "*Function to execute when `message-tab' (TAB) is executed in the body.")
+(defcustom message-tab-body-function 'indent-relative
+  "*Function to execute when `message-tab' (TAB) is executed in the body."
+  :group 'message
+  :type 'function)
 
 (defun message-tab ()
   "Complete names according to `message-completion-alist'.
-Do an `indent-relative' if not in those headers."
+Execute function specified by `message-tab-body-function' when not in
+those headers."
   (interactive)
   (let ((alist message-completion-alist))
     (while (and alist