message.el (message-display-completion-list): Abolish

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8b0a8f..ee77808 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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):
 2013-09-17  Glenn Morris  <rgm@gnu.org>
 
        * gnus-util.el (gnus-message-with-timestamp-1):

diff --git a/lisp/message.el b/lisp/message.el
index 4878dc3..7f376e6 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7991,17 +7991,6 @@ those headers."
         ;; falling back to message-tab-body-function.
         (lambda () (funcall fun) 'completion-attempted)))))
 
         ;; 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
 (defun message-expand-group ()
   "Expand the group name under point."
   (let ((b (save-excursion


@@ -8056,8 +8045,7 @@ those headers."
               (let ((buffer-read-only nil))
                 (erase-buffer)
                 (let ((standard-output (current-buffer)))
               (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)
                 (setq buffer-read-only nil)
                 (goto-char (point-min))
                 (delete-region (point)