(mail-abbrev-complete-alias): Use completion-in-region.

2 files changed, 9 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92f0ed538fe..002a04641b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * mail/mailabbrev.el (mail-abbrev-complete-alias):
+        Use completion-in-region.
+
         * dabbrev.el (dabbrev--minibuffer-origin): Use minibuffer-selected-window.
         (dabbrev-completion): Use completion-in-region.
         (dabbrev--abbrev-at-point): Simplify regexp.
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index b0d77217dcb..08f7b37b630 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -569,27 +569,12 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
   ;; Based on lisp.el:lisp-complete-symbol
   (interactive)
   (mail-abbrev-make-syntax-table)
-  (let* ((end (point))
-         (beg (with-syntax-table mail-abbrev-syntax-table
-                (save-excursion
-                  (backward-word 1)
-                  (point))))
-         (alias (buffer-substring beg end))
-         (completion (try-completion alias mail-abbrevs)))
-    (cond ((eq completion t)
-           (message "%s" alias))        ; confirm
-          ((null completion)
-           (error "[Can't complete \"%s\"]" alias)) ; (message ...) (ding)
-          ((not (string= completion alias))
-           (delete-region beg end)
-           (insert completion))
-          (t (with-output-to-temp-buffer "*Completions*"
-               (display-completion-list
-                (prog2
-                    (message "Making completion list...")
-                    (all-completions alias mail-abbrevs)
-                  (message "Making completion list...done"))
-                alias))))))
+  (let ((end (point))
+        (beg (with-syntax-table mail-abbrev-syntax-table
+               (save-excursion
+                 (backward-word 1)
+                 (point)))))
+    (completion-in-region beg end mail-abbrevs)))
 
 (defun mail-abbrev-next-line (&optional arg)
   "Expand a mail abbrev before point, then move vertically down ARG lines.