From ea2f43b386c1bdd005351eacbecf47ed2f60fd77 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 5 Jan 2004 05:11:55 +0000
Subject: [PATCH] Synch to No Gnus 200401050452.

---
 lisp/ChangeLog   |   14 ++++++++++++++
 lisp/gnus-art.el |   16 ----------------
 lisp/gnus-msg.el |    4 ++--
 lisp/nnmail.el   |    4 ++--
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54106dc..77c7d25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* ntlm.el (ntlm-string-as-unibyte): New macro.
+	(ntlm-build-auth-response): Use it.
+
+	Remove Emacs 20 stuff:
+	* dgnushack.el (dgnushack-compile): Don't modify max-specpdl-size.
+	(butlast, mapc, remove): Remove the compiler macros.
+	* gnus-msg.el (gnus-summary-news-other-window): Use remove instead
+	of delq and copy-sequence.
+	* gnus-art.el (popup-menu): Remove the compiler macro.
+	* nnmail.el (nnmail-split-fancy): Don't support customizing with
+	Emacs 20.
+
 2004-01-05  Simon Josefsson  <jas@extundo.com>
 
 	* ntlm.el: Fix namespace.  Change smb-passwd-hash into
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 549117a..5b002b5 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4276,22 +4276,6 @@ General format specifiers can also be used.  See Info node
 		(vector (caddr c) (car c) :enable t))
 	      gnus-mime-button-commands)))
 
-(eval-when-compile
-  (define-compiler-macro popup-menu (&whole form
-					    menu &optional position prefix)
-    (if (and (fboundp 'popup-menu)
-	     (not (memq 'popup-menu (assoc "lmenu" load-history))))
-	form
-      ;; Gnus is probably running under Emacs 20.
-      `(let* ((menu (cdr ,menu))
-	      (response (x-popup-menu
-			 t (list (car menu)
-				 (cons "" (mapcar (lambda (c)
-						    (cons (caddr c) (car c)))
-						  (cdr menu)))))))
-	 (if response
-	     (call-interactively (nth 3 (assq response menu))))))))
-
 (defun gnus-mime-button-menu (event prefix)
  "Construct a context-sensitive menu of MIME commands."
  (interactive "e\nP")
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 479979e..af67d36 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -704,9 +704,9 @@ network.  The corresponding back end must have a 'request-post method."
 	    (progn
 	      (message-news (gnus-group-real-name gnus-newsgroup-name))
 	      (set (make-local-variable 'gnus-discouraged-post-methods)
-		   (delq
+		   (remove
 		    (car (gnus-find-method-for-group gnus-newsgroup-name))
-		    (copy-sequence gnus-discouraged-post-methods))))))
+		    gnus-discouraged-post-methods)))))
       (save-excursion
 	(set-buffer buffer)
 	(setq gnus-newsgroup-name group)))))
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 3e52196..2e5d87a 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -406,13 +406,13 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                             (const :format "" &)
                             (editable-list :inline t nnmail-split-fancy))
                       (list :tag "Function with fixed arguments (:)"
-                            :value (: nil)
+                            :value (:)
                             (const :format "" :value :)
                             function 
                             (editable-list :inline t (sexp :tag "Arg"))
                             )
                       (list :tag "Function with split arguments (!)"
-                            :value (! nil)
+                            :value (!)
                             (const :format "" !)
                             function
                             (editable-list :inline t nnmail-split-fancy))
-- 
1.7.10.4