From 88dfd27d0ea493d180e919e716c7880b9818ddfb Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 9 Jun 2004 00:20:12 +0000
Subject: [PATCH] Synch to No Gnus 200406082254.

---
 ChangeLog        |    4 ++++
 lisp/ChangeLog   |   11 +++++++++++
 lisp/gnus-art.el |    3 ++-
 lisp/lpath.el    |    2 +-
 lisp/message.el  |   31 ++++++++++++++++++++++++++++---
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e7735a..ec0a9e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/lpath.el: Fbind lsdb-complete-name.
+
 2004-06-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* etc/gnus/gnus-setup.ast (Setting up a NNTP server)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da11acf..4dd141d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-hide-headers): Don't change the buffer
+	mistakenly when performing mml-preview even if
+	gnus-single-article-buffer is nil.
+
+2004-06-08  Kai Grossjohann  <kgrossjo@eu.uu.net>
+
+	* message.el (message-expand-name-databases): New user option.
+	(message-expand-name): Use it.
+
 2004-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-report-articles-resend)
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 19624e7..6432e62 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1701,6 +1701,7 @@ Initialized from `text-mode-syntax-table.")
 	    (case-fold-search t)
 	    (max (1+ (length gnus-sorted-header-list)))
 	    (inhibit-point-motion-hooks t)
+	    (cur (current-buffer))
 	    ignored visible beg)
 	(save-excursion
 	  ;; `gnus-ignored-headers' and `gnus-visible-headers' may be
@@ -1723,7 +1724,7 @@ Initialized from `text-mode-syntax-table.")
 				       (mapconcat 'identity
 						  gnus-visible-headers
 						  "\\|")))))
-	    (set-buffer gnus-article-buffer))
+	    (set-buffer cur))
 	  (save-restriction
 	    ;; First we narrow to just the headers.
 	    (article-narrow-to-head)
diff --git a/lisp/lpath.el b/lisp/lpath.el
index 9c188ca..7d1c2e3 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -88,7 +88,7 @@
 	(t
 	 '(function-max-args smiley-encode-buffer))))
       (common-fns
-       nil)
+       '(lsdb-complete-name))
       (variables
        (cond
 	((featurep 'xemacs)
diff --git a/lisp/message.el b/lisp/message.el
index ba81415..f28daaf 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7300,6 +7300,13 @@ which specify the range to operate on."
   :group 'message
   :type '(alist :key-type regexp :value-type function))
 
+(defcustom message-expand-name-databases
+  (list 'bbdb 'eudc 'lsdb)
+  "List of databases to try for name completion (`message-expand-name').
+Each element is a symbol and can be `bbdb', `eudc' or `lsdb'."
+  :group 'message
+  :type '(set (const bbdb) (const eudc) (const lsdb)))
+
 (defcustom message-expand-name-function
   (cond ((and (boundp 'eudc-protocol)
 	      eudc-protocol)
@@ -7309,9 +7316,15 @@ which specify the range to operate on."
 	((fboundp 'lsdb-complete-name)
 	 'lsdb-complete-name)
 	(t 'expand-abbrev))
-  "*A function called to expand addresses in field body."
+  "*A function called to expand addresses in field body.
+This variable is semi-obsolete, set it as nil and use
+`message-expand-name-databases' instead."
   :group 'message
-  :type 'function)
+  :type '(radio (const :format "Invalidate it: %v\n" nil)
+		(function-item :format "eudc: %v\n" eudc-expand-inline)
+		(function-item :format "bbdb: %v\n" bbdb-complete-name)
+		(function-item :format "lsdb: %v\n" lsdb-complete-name)
+		(function :size 0 :value expand-abbrev)))
 
 (defcustom message-tab-body-function nil
   "*Function to execute when `message-tab' (TAB) is executed in the body.
@@ -7378,7 +7391,19 @@ those headers."
 	    (delete-region (point) (progn (forward-line 3) (point))))))))))
 
 (defun message-expand-name ()
-  (funcall message-expand-name-function))
+  (cond (message-expand-name-function
+	 (funcall message-expand-name-function))
+	((and (memq 'eudc message-expand-name-databases)
+	      (boundp 'eudc-protocol)
+	      eudc-protocol)
+	 (eudc-expand-inline))
+	((and (memq 'bbdb message-expand-name-databases)
+	      (fboundp 'bbdb-complete-name))
+	 (bbdb-complete-name))
+	((and (memq 'lsdb message-expand-name-databases)
+	      (fboundp 'lsdb-complete-name))
+	 (lsdb-complete-name))
+	(t 'expand-abbrev)))
 
 ;;; Help stuff.
 
-- 
1.7.10.4