From: yamaoka <yamaoka>
Date: Wed, 8 Jan 2003 04:04:35 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_12-00-quimby~29
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfe637a130180e704e8fa24382c3706c3f89ae7c;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2063a80..9b57af3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,17 @@
+2003-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* message.el (message-generate-headers-first): Added customization
+	if variable is a list.
+
+2003-01-07  Michael Shields  <shields@msrl.com>
+
+	* gnus-art.el (gnus-article-next-page): Correctly handle the case
+	where the last line of the article is the last line of the window.
+
 2003-01-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-msg.el (gnus-debug): Use ignore-errors.
+
 	* gnus-agent.el (gnus-agent-fetch-selected-article): Use
 	`gnus-summary-update-line'. 
 
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 0ed987c..21b6907 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1705,17 +1705,15 @@ The source file has to be in the Emacs load path."
       (insert ";----------------- Environment follows ------------------\n\n"))
     (while olist
       (if (boundp (car olist))
-	  (condition-case ()
-	      (pp `(setq ,(car olist)
-			 ,(if (or (consp (setq sym (symbol-value (car olist))))
-				  (and (symbolp sym)
-				       (not (or (eq sym nil)
-						(eq sym t)))))
-			      (list 'quote (symbol-value (car olist)))
-			    (symbol-value (car olist))))
-		  (current-buffer))
-	    (error
-	     (format "(setq %s 'whatever)\n" (car olist))))
+	  (ignore-errors
+	    (pp `(setq ,(car olist)
+		       ,(if (or (consp (setq sym (symbol-value (car olist))))
+				(and (symbolp sym)
+				     (not (or (eq sym nil)
+					      (eq sym t)))))
+			    (list 'quote (symbol-value (car olist)))
+			  (symbol-value (car olist))))
+		(current-buffer)))
 	(insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
       (setq olist (cdr olist)))
     ;; Remove any control chars - they seem to cause trouble for some
diff --git a/lisp/message.el b/lisp/message.el
index d218409..a4a2a2a 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -846,7 +846,9 @@ Note that the variable `message-deletable-headers' specifies headers which
 are to be deleted and then re-generated before sending, so this variable
 will not have a visible effect for those headers."
   :group 'message-headers
-  :type 'boolean)
+  :type '(choice (const :tag "None" nil)
+                 (const :tag "All" t)
+                 (repeat (sexp :tag "Header"))))
 
 (defcustom message-setup-hook '(turn-on-mime-edit)
   "Normal hook, run each time a new outgoing message is initialized.