From: yamaoka <yamaoka>
Date: Wed, 26 Oct 2005 01:51:26 +0000 (+0000)
Subject: Synch to No Gnus 200510260151.
X-Git-Tag: t-gnus-6_17_4-quimby-~280
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=aed1989924f80deb369a834ef0a4ffa524e178b8;p=elisp%2Fgnus.git-

Synch to No Gnus 200510260151.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a66c0d8..355fa7b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-display-completion-list): New function.
+	(message-expand-group): Use it; make sure the Completions buffer
+	is modifiable.
+
 2005-10-23  Chong Yidong  <cyd@stupidchicken.com>
 
 	* gnus-sum.el (gnus-ignored-from-addresses): Handle case where
diff --git a/lisp/message.el b/lisp/message.el
index 6cbb8f1..3780f28 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7518,6 +7518,17 @@ those headers."
 		 (lookup-key global-map "\t")
 		 'indent-relative))))
 
+(eval-and-compile
+  (condition-case nil
+      (with-temp-buffer
+	(let ((standard-output (current-buffer)))
+	  (eval '(display-completion-list nil "")))
+	(defalias 'message-display-completion-list 'display-completion-list))
+    (error ;; Don't use `wrong-number-of-arguments' here because of XEmacs.
+     (defun message-display-completion-list (completions &optional ignore)
+       "Display the list of completions, COMPLETIONS, using `standard-output'."
+       (display-completion-list completions)))))
+
 (defun message-expand-group ()
   "Expand the group name under point."
   (let* ((b (save-excursion
@@ -7556,7 +7567,9 @@ those headers."
 	  (let ((buffer-read-only nil))
 	    (erase-buffer)
 	    (let ((standard-output (current-buffer)))
-	      (display-completion-list (sort completions 'string<) string))
+	      (message-display-completion-list (sort completions 'string<)
+					       string))
+	    (setq buffer-read-only nil)
 	    (goto-char (point-min))
 	    (delete-region (point) (progn (forward-line 3) (point))))))))))