From 9ef286b48ad6b33421fbcd93f36def4edbc161bf Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Sat, 15 Jul 2000 11:41:55 +0000
Subject: [PATCH] Synch up with t-gnus-6_14-quimby.

---
 README-gnus-bbdb.en |    6 ++++--
 README-gnus-bbdb.ja |    6 ++++--
 lisp/gnus-art.el    |    2 ++
 lisp/gnus-bbdb.el   |   18 ++++++++++++------
 lisp/gnus-vers.el   |    2 +-
 lisp/imap.el        |    1 +
 lisp/nnimap.el      |   15 ++++++---------
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/README-gnus-bbdb.en b/README-gnus-bbdb.en
index b99d805..287636e 100644
--- a/README-gnus-bbdb.en
+++ b/README-gnus-bbdb.en
@@ -28,6 +28,7 @@ of this file should be applied. If not, it might not.
 (require 'gnus-bbdb)
 (bbdb-initialize 'sc)  ;; 'Gnus or 'gnus should be deleted.
 (add-hook 'gnus-startup-hook 'gnus-bbdb-insinuate)
+(add-hook 'message-setup-hook 'gnus-bbdb-insinuate-message)
 
  If you would like to decode the quoted encoded words forcibly, even
 though FLIM does not decode them, put the following lines in your
@@ -44,7 +45,7 @@ though FLIM does not decode them, put the following lines in your
 ------ cut here ------ cut here ------ cut here ------ cut here ------
 --- bbdb-hooks.el~	Tue Oct 13 03:13:50 1998
 +++ bbdb-hooks.el	Fri Oct 30 17:05:53 1998
-@@ -352,12 +352,22 @@
+@@ -352,12 +352,23 @@
  	(marker (bbdb-header-start))
  	field pairs fieldval  ; do all bindings here for speed
  	regexp string notes-field-name notes
@@ -60,8 +61,9 @@ though FLIM does not decode them, put the following lines in your
 +	    function)
 +	(or (progn
 +	      (while (and (not extract-field-value-funtion)
-+			  (setq function (pop function-list)))
++			  (setq function (car function-list)))
 +		(setq extract-field-value-funtion (funcall function)))
++		      function-list (cdr function-list)))
 +	      extract-field-value-funtion)
 +	    (progn
 +	      (widen)
diff --git a/README-gnus-bbdb.ja b/README-gnus-bbdb.ja
index 393256e..f9f99bf 100644
--- a/README-gnus-bbdb.ja
+++ b/README-gnus-bbdb.ja
@@ -29,6 +29,7 @@ bbdb-auto-notes-hook $B$r;HMQ$7$F$$$J$$J}$K$OITMW$G$9$,!";HMQ$7$F$$$kJ}(B
 (require 'gnus-bbdb)
 (bbdb-initialize 'sc)  ;; 'gnus / 'Gnus $B$O$O$:$7$F$/$@$5$$!#(B
 (add-hook 'gnus-startup-hook 'gnus-bbdb-insinuate)
+(add-hook 'message-setup-hook 'gnus-bbdb-insinuate-message)
 
 FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$;$s$,!"$=$l(B
 $B$r6/@)E*$K(B decode $B$7$?$$>l9g$K$O!"<!$N@_Dj$r2C$($F$/$@$5$$!#(B
@@ -44,7 +45,7 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$
 ------ cut here ------ cut here ------ cut here ------ cut here ------
 --- bbdb-hooks.el~	Tue Oct 13 03:13:50 1998
 +++ bbdb-hooks.el	Fri Oct 30 17:05:53 1998
-@@ -352,12 +352,22 @@
+@@ -352,12 +352,23 @@
  	(marker (bbdb-header-start))
  	field pairs fieldval  ; do all bindings here for speed
  	regexp string notes-field-name notes
@@ -60,8 +61,9 @@ FLIM $B$G$O(B quote $B$5$l$?(B eword encoded word $B$O(B decode $B$5$l$^$
 +	    function)
 +	(or (progn
 +	      (while (and (not extract-field-value-funtion)
-+			  (setq function (pop function-list)))
++			  (setq function (car function-list)))
 +		(setq extract-field-value-funtion (funcall function)))
++		      function-list (cdr function-list)))
 +	      extract-field-value-funtion)
 +	    (progn
 +	      (widen)
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9e01c05..0070232 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2865,6 +2865,7 @@ commands:
     ;; Init original article buffer.
     (save-excursion
       (set-buffer (gnus-get-buffer-create gnus-original-article-buffer))
+      (set-buffer-multibyte nil)
       (setq major-mode 'gnus-original-article-mode)
       (make-local-variable 'gnus-original-article))
     (if (get-buffer name)
@@ -4260,6 +4261,7 @@ If given a prefix, show the hidden text instead."
 	  (if (get-buffer gnus-original-article-buffer)
 	      (set-buffer gnus-original-article-buffer)
 	    (set-buffer (gnus-get-buffer-create gnus-original-article-buffer))
+	    (set-buffer-multibyte nil)
 	    (buffer-disable-undo)
 	    (setq major-mode 'gnus-original-article-mode)
 	    (setq buffer-read-only t))
diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el
index 45cca0a..ccc5b91 100644
--- a/lisp/gnus-bbdb.el
+++ b/lisp/gnus-bbdb.el
@@ -248,8 +248,10 @@ This variable has no effect on the marking controlled by
   :group 'bbdb-mua-specific-gnus
   :type '(choice (const :tag "Mark known posters" t)
 		 (const :tag "Do not mark known posters" nil)))
-(defvaralias 'gnus-bbdb/mark-known-posters
-  'gnus-bbdb/summary-mark-known-posters)
+(static-when (and (fboundp 'defvaralias)
+		  (subrp (symbol-function 'defvaralias)))
+  (defvaralias 'gnus-bbdb/mark-known-posters
+    'gnus-bbdb/summary-mark-known-posters))
 
 (defcustom gnus-bbdb/summary-known-poster-mark "+"
   "This is the default character to prefix author names with if
@@ -268,8 +270,10 @@ people who aren't in the database, of course.  (`gnus-optional-headers'
 must be `gnus-bbdb/lines-and-from' for GNUS users.)"
   :group 'bbdb-mua-specific-gnus
   :type 'boolean)
-(defvaralias 'gnus-bbdb/header-show-bbdb-names
-  'gnus-bbdb/summary-show-bbdb-names)
+(static-when (and (fboundp 'defvaralias)
+		  (subrp (symbol-function 'defvaralias)))
+  (defvaralias 'gnus-bbdb/header-show-bbdb-names
+    'gnus-bbdb/summary-show-bbdb-names))
 
 (defcustom gnus-bbdb/summary-prefer-bbdb-data t
   "If t, then for posters who are in our BBDB, replace the information
@@ -288,8 +292,10 @@ See `gnus-bbdb/lines-and-from' for GNUS users, or
   :group 'bbdb-mua-specific-gnus
   :type '(choice (const :tag "Prefer real names" t)
 		 (const :tag "Prefer network addresses" nil)))
-(defvaralias 'gnus-bbdb/header-prefer-real-names
-  'gnus-bbdb/summary-prefer-real-names)
+(static-when (and (fboundp 'defvaralias)
+		  (subrp (symbol-function 'defvaralias)))
+  (defvaralias 'gnus-bbdb/header-prefer-real-names
+    'gnus-bbdb/summary-prefer-real-names))
 
 (defcustom gnus-bbdb/summary-user-format-letter "B"
   "This is the gnus-user-format-function- that will be used to insert
diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index e447493..25c1a3f 100644
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "00"
+(defconst gnus-revision-number "01"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.
diff --git a/lisp/imap.el b/lisp/imap.el
index 919a250..f0a44d6 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -761,6 +761,7 @@ necessery.  If nil, the buffer name is generated."
     (if (imap-opened buffer)
 	(imap-close buffer))
     (mapcar 'make-variable-buffer-local imap-local-variables)
+    (set-buffer-multibyte nil)
     (buffer-disable-undo)
     (setq imap-server (or server imap-server))
     (setq imap-port (or port imap-port))
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 669e9f3..d9b68c4 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -624,12 +624,11 @@ function is generally only called when Gnus is shutting down."
   (with-current-buffer nnimap-callback-buffer
     (insert
      (with-current-buffer nnimap-server-buffer
-       (nnimap-demule
-        (if (imap-capability 'IMAP4rev1) 
-            ;; xxx don't just use car? alist doesn't contain
-            ;; anything else now, but it might...
-            (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
-          (imap-message-get (imap-current-message) 'RFC822)))))
+       (if (imap-capability 'IMAP4rev1) 
+	   ;; xxx don't just use car? alist doesn't contain
+	   ;; anything else now, but it might...
+	   (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
+	 (imap-message-get (imap-current-message) 'RFC822))))
     (nnheader-ms-strip-cr)
     (funcall nnimap-callback-callback-function t)))
 
@@ -649,9 +648,7 @@ function is generally only called when Gnus is shutting down."
 	      (let ((data (imap-fetch article part prop nil
 				      nnimap-server-buffer)))
 		(when data
-		  (insert (nnimap-demule (if detail
-					     (nth 2 (car data))
-					   data)))
+		  (insert (if detail (nth 2 (car data)) data))
 		  (nnheader-ms-strip-cr)
 		  (gnus-message 9
 				"nnimap: Fetching (part of) article %d...done"
-- 
1.7.10.4