From ca61a1472fbf0a87fe4adc25fe11462ca3f1466a Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 4 Feb 2003 23:49:29 +0000
Subject: [PATCH] Synch to Oort Gnus.

---
 lisp/ChangeLog     |   10 ++++++++++
 lisp/gnus-delay.el |    9 +++++++--
 lisp/gnus.el       |   12 ++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63a98c1..c566e73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus.el (spam group parameters): change 'other to 'const in
+	the group parameter definitions to soothe XEmacs
+
+2003-02-04  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+	* gnus-delay.el (gnus-delay-article): Really create
+	nndraft:delayed group if it doesn't exist.
+
 2003-02-04  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-sum.el (gnus-summary-search-article): Speed up by
diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index cb4fc91..2695b74 100644
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -80,7 +80,8 @@ DELAY is a string, giving the length of the time.  Possible values are:
    (list (read-string
 	  "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): "
 	  gnus-delay-default-delay)))
-  (let (num unit days year month day hour minute deadline)
+  (let ((group (format "nndraft:%s" gnus-delay-group))
+	num unit days year month day hour minute deadline)
     (cond ((string-match
 	    "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)"
 	    delay)
@@ -132,7 +133,11 @@ DELAY is a string, giving the length of the time.  Possible values are:
 	  (t (error "Malformed delay `%s'" delay)))
     (message-add-header (format "%s: %s" gnus-delay-header deadline)))
   (set-buffer-modified-p t)
-  (nndraft-request-create-group gnus-delay-group)
+  ;; If group does not exist, create it.
+  (unless (gnus-gethash group gnus-newsrc-hashtb)
+    (nndraft-request-create-group gnus-delay-group)
+    ;; Make it active.
+    (gnus-set-active group (cons 1 0)))
   (message-disassociate-draft)
   (nndraft-request-associate-buffer gnus-delay-group)
   (save-buffer 0)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 0f3ecf1..78d72b1 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1821,13 +1821,13 @@ This only makes sense for mail groups."
 			  (choice
 			   (variable-item gnus-group-spam-classification-spam)
 			   (variable-item gnus-group-spam-classification-ham)
-			   (other :tag "Unclassified" nil))))
+			   (const :tag "Unclassified" nil))))
 
    :parameter-type '(list :tag "Group contents spam/ham classification"
 			  (choice :tag "Group contents classification for spam sorting"
 				  (variable-item gnus-group-spam-classification-spam)
 				  (variable-item gnus-group-spam-classification-ham)
-				  (other :tag "Unclassified" nil)))
+				  (const :tag "Unclassified" nil)))
    :parameter-document
    "The spam classification (spam, ham, or neither) of this group.
 When a spam group is entered, all unread articles are marked as spam.")
@@ -1915,7 +1915,7 @@ for mail groups."
    spam-process-destination
    :parameter-type '(choice :tag "Destination for spam-processed articles at summary exit"
 			    (string :tag "Move to a group")
-			    (other :tag "Expire" nil))
+			    (const :tag "Expire" nil))
    :function-document
    "Where spam-processed articles will go at summary exit."
    :variable gnus-spam-process-destinations
@@ -1935,7 +1935,7 @@ mail groups."
 		     (choice 
 		      :tag "Destination for spam-processed articles at summary exit"
 		      (string :tag "Move to a group")
-		      (other :tag "Expire" nil))))
+		      (const :tag "Expire" nil))))
    :parameter-document
    "Where spam-processed articles will go at summary exit.")
 
@@ -1944,7 +1944,7 @@ mail groups."
    :parameter-type '(choice 
 		     :tag "Destination for ham articles at summary exit from a spam group"
 		     (string :tag "Move to a group")
-		     (other :tag "Do nothing" nil))
+		     (const :tag "Do nothing" nil))
    :function-document
    "Where ham articles will go at summary exit from a spam group."
    :variable gnus-ham-process-destinations
@@ -1964,7 +1964,7 @@ mail groups, and only works in spam groups."
 		     (choice 
 		      :tag "Destination for ham articles at summary exit from spam group"
 		      (string :tag "Move to a group")
-		      (other :tag "Expire" nil))))
+		      (const :tag "Expire" nil))))
    :parameter-document
    "Where ham articles will go at summary exit from a spam group."))
 
-- 
1.7.10.4