Synch to Oort Gnus 200304160002.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da31cf5..e14642e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
+2003-04-16  Kevin Greiner <kgreiner@xpediantsolutions.com>
+
+       * gnus-agent.el (gnus-agent-make-cat): Added optional parameter to
+       specify a predicate other than false.
+       (gnus-category-read): Use the new feature to create a 'default'
+       category with a 'short' predicate.
+       
 2003-04-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-unique-id): Comment change.
+
        * gnus-art.el (gnus-article-next-page-1): New function.
        (gnus-article-next-page): Use it.
 

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index c884cd1..413e4f1 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -380,8 +380,8 @@ manipulated as follows:
                            (setcdr category (cons cell (cdr category)))
                            cell)) groups))))))
 
-(defsubst gnus-agent-cat-make (name)
-  (list name '(agent-predicate . false)))
+(defsubst gnus-agent-cat-make (name &optional default-agent-predicate)
+  (list name `(agent-predicate . ,(or default-agent-predicate 'false))))
 
 ;;; Fetching setup functions.
 
@@ -2206,7 +2206,7 @@ The following commands are available:
                                   '(agent-predicate agent-score-file agent-groups))))
                    c)
                  old-list)))))
-         (list (gnus-agent-cat-make 'default)))))
+         (list (gnus-agent-cat-make 'default 'short)))))
 
 (defun gnus-category-write ()
   "Write the category alist."

diff --git a/lisp/message.el b/lisp/message.el
index c1cbb74..02b89c3 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4997,9 +4997,9 @@ If NOW, use that time instead."
                               (lsh (% message-unique-id-char 25) 16)) 4)
      (message-number-base36 (+ (nth 1 tm)
                               (lsh (/ message-unique-id-char 25) 16)) 4)
-     ;; Append the newsreader name, because while the generated
-     ;; ID is unique to this newsreader, other newsreaders might
-     ;; otherwise generate the same ID via another algorithm.
+     ;; Append a given name, because while the generated ID is unique
+     ;; to this newsreader, other newsreaders might otherwise generate
+     ;; the same ID via another algorithm.
      ".fsf")))
 
 (defun message-number-base36 (num len)