2 files changed, 6 insertions, 13 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ab969d3d5fb..99c2f85ee6c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-display-completion-list): Abolish.
+        (message-completion-in-region): Use display-completion-list.
+
 2013-09-17  Glenn Morris  <rgm@gnu.org>
 
         * gnus-util.el (gnus-message-with-timestamp-1):
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ba4593fad45..a458b3fc25b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7947,17 +7947,6 @@ those headers."
         ;; falling back to message-tab-body-function.
         (lambda () (funcall fun) 'completion-attempted)))))
 
-(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
@@ -8012,8 +8001,7 @@ those headers."
               (let ((buffer-read-only nil))
                 (erase-buffer)
                 (let ((standard-output (current-buffer)))
-                  (message-display-completion-list (sort completions 'string<)
-                                                   string))
+                  (display-completion-list (sort completions 'string<)))
                 (setq buffer-read-only nil)
                 (goto-char (point-min))
                 (delete-region (point)