[Emacs-diffs] emacs/lisp ChangeLog progmodes/etags.el progmod...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/25 06:08:45

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : etags.el meta-mode.el 

Log message:
        * progmodes/meta-mode.el (meta-complete-symbol):
        * progmodes/etags.el (complete-tag): Use completion-in-region.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16729&r2=1.16730
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/etags.el?cvsroot=emacs&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/meta-mode.el?cvsroot=emacs&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16729
retrieving revision 1.16730
diff -u -b -r1.16729 -r1.16730
--- ChangeLog   25 Nov 2009 06:02:01 -0000      1.16729
+++ ChangeLog   25 Nov 2009 06:08:42 -0000      1.16730
@@ -1,5 +1,7 @@
 2009-11-25  Stefan Monnier  <address@hidden>
 
+       * progmodes/meta-mode.el (meta-complete-symbol):
+       * progmodes/etags.el (complete-tag):
        * mail/mailabbrev.el (mail-abbrev-complete-alias):
        Use completion-in-region.
 

Index: progmodes/etags.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/etags.el,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- progmodes/etags.el  6 Nov 2009 05:16:30 -0000       1.216
+++ progmodes/etags.el  25 Nov 2009 06:08:45 -0000      1.217
@@ -2047,28 +2047,13 @@
                              (get major-mode 'find-tag-default-function)
                              'find-tag-default)))
         (comp-table (tags-lazy-completion-table))
-       beg
-       completion)
+       beg)
     (or pattern
        (error "Nothing to complete"))
     (search-backward pattern)
     (setq beg (point))
     (forward-char (length pattern))
-    (setq completion (try-completion pattern comp-table))
-    (cond ((eq completion t))
-         ((null completion)
-          (message "Can't find completion for \"%s\"" pattern)
-          (ding))
-         ((not (string= pattern completion))
-          (delete-region beg (point))
-          (insert completion))
-         (t
-          (message "Making completion list...")
-          (with-output-to-temp-buffer "*Completions*"
-            (display-completion-list
-             (all-completions pattern comp-table nil)
-             pattern))
-          (message "Making completion list...%s" "done")))))
+    (completion-in-region beg (point) comp-table)))
 
 (dolist (x '("^No tags table in use; use .* to select one$"
             "^There is no default tag$"

Index: progmodes/meta-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/meta-mode.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- progmodes/meta-mode.el      5 Jan 2009 03:23:45 -0000       1.26
+++ progmodes/meta-mode.el      25 Nov 2009 06:08:45 -0000      1.27
@@ -487,29 +487,12 @@
                (close (nth 3 entry))
                (begin (match-beginning sub))
                (end (match-end sub))
-               (pattern (meta-match-buffer 0))
-               (symbol (buffer-substring begin end))
-               (list (funcall (nth 2 entry)))
-               (completion (try-completion symbol list)))
-          (cond ((eq completion t)
-                 (and close
-                      (not (looking-at (regexp-quote close)))
-                      (insert close)))
-                ((null completion)
-                 (error "Can't find completion for \"%s\"" pattern))
-                ((not (string-equal symbol completion))
-                 (delete-region begin end)
-                 (insert completion)
-                 (and close
-                      (eq (try-completion completion list) t)
-                      (not (looking-at (regexp-quote close)))
-                      (insert close)))
-                (t
-                 (message "Making completion list...")
-                 (let ((list (all-completions symbol list nil)))
-                   (with-output-to-temp-buffer "*Completions*"
-                     (display-completion-list list symbol)))
-                 (message "Making completion list... done"))))
+               (list (funcall (nth 2 entry))))
+          (completion-in-region
+           begin end
+           (if (zerop (length close)) list
+             (apply-partially 'completion-table-with-terminator
+                              close list))))
       (funcall (nth 1 entry)))))