From: yamaoka <yamaoka>
Date: Sun, 10 Dec 2000 23:12:37 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b6e1088c1079e93d9290976459825b434328d0;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22d1e25..5104b18 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-08 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (article-verify-x-pgp-sig): Don't test
+	mm-verify-option.
+	(gnus-treat-x-pgp-sig): Default value.
+	(gnus-ignored-headers): Redundant.
+
 2000-12-04 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-win.el (gnus-configure-frame): Save selected window.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 6257f5c..a95f96c 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -126,7 +126,7 @@
     "^Precedence:" "^Original-[-A-Za-z]+:" "^X-filename:" "^X-Orcpt:"
     "^Old-Received:" "^X-Pgp" "^X-Auth:" "^X-From-Line:"
     "^X-Gnus-Article-Number:" "^X-Majordomo:" "^X-Url:" "^X-Sender:"
-    "^MBOX-Line" "^Priority:" "^X-Pgp" "^X400-[-A-Za-z]+:"
+    "^MBOX-Line" "^Priority:" "^X400-[-A-Za-z]+:"
     "^Status:" "^X-Gnus-Mail-Source:" "^Cancel-Lock:"
     "^X-FTN" "^X-EXP32-SerialNo:" "^Encoding:" "^Importance:"
     "^Autoforwarded:" "^Original-Encoded-Information-Types:" "^X-Ya-Pop3:"
@@ -1020,6 +1020,7 @@ See the manual for details."
 
 (defcustom gnus-treat-x-pgp-sig nil
   "Verify X-PGP-Sig.
+To automatically treat X-PGP-Sig, set it to head.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See the manual for details."
   :group 'gnus-article-treat
@@ -2755,8 +2756,6 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 	 (expand-file-name "news" (gnus-newsgroup-directory-form newsgroup)))
        gnus-article-save-directory)))
 
-(autoload 'mm-uu-pgp-signed-test "mm-uu")
-
 (defun article-verify-x-pgp-sig ()
   "Verify X-PGP-Sig."
   (interactive)
@@ -2764,7 +2763,9 @@ If variable `gnus-use-long-file-name' is non-nil, it is
       (let ((sig (with-current-buffer gnus-original-article-buffer
 		   (gnus-fetch-field "X-PGP-Sig")))
 	    items info headers)
-	(when (and sig (mm-uu-pgp-signed-test))
+	(when (and sig 
+		   mml2015-use
+		   (mml2015-clear-verify-function))
 	  (with-temp-buffer
 	    (insert-buffer gnus-original-article-buffer)
 	    (setq items (split-string sig))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index df70d52..9c810db 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-10  Jim Meyering  <meyering@lucent.com>
+
+	* Makefile.in (.texi): Use `-I $(srcdir)' with `makeinfo' so that
+	non-srcdir builds work.
+
 2000-11-29 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus.texi (Fancy Mail Splitting): Add.
diff --git a/texi/Makefile.in b/texi/Makefile.in
index a44c58c..3d447b3 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -61,7 +61,7 @@ most: texi2latex.elc latex latexps
 
 .texi:
 	if test "x$(MAKEINFO)" != "xno" ; then \
-	  makeinfo -o $* $<; \
+	  makeinfo -I $(srcdir) -o $* $<; \
 	else \
 	  cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
 	    $(EMACSINFOHACK) $(INFOSWI) ../texi/$<; \