[Emacs-diffs] /srv/bzr/emacs/trunk r105810: complete-tag fix for bug#9526

[Glenn Morris]

------------------------------------------------------------
revno: 105810
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-17 12:05:52 -0700
message:
  complete-tag fix for bug#9526
  
  * lisp/progmodes/etags.el (complete-tag):
  Fix call to completion-in-region. (cf info-complete).
modified:
  lisp/ChangeLog
  lisp/progmodes/etags.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-17 12:07:50 +0000
+++ b/lisp/ChangeLog    2011-09-17 19:05:52 +0000
@@ -1,3 +1,8 @@
+2011-09-17  Glenn Morris  <address@hidden>
+
+       * progmodes/etags.el (complete-tag):
+       Fix call to completion-in-region.  (Bug#9526)
+
 2011-09-17  Juri Linkov  <address@hidden>
 
        * textmodes/ispell.el (ispell-word): Add to the error message

=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el   2011-07-20 16:45:00 +0000
+++ b/lisp/progmodes/etags.el   2011-09-17 19:05:52 +0000
@@ -2070,7 +2070,9 @@
   (let ((comp-data (tags-completion-at-point-function)))
     (if (null comp-data)
        (error "Nothing to complete")
-      (apply 'completion-in-region comp-data))))
+      (completion-in-region (car comp-data) (cadr comp-data)
+                           (nth 2 comp-data)
+                           (plist-get (nthcdr 3 comp-data) :predicate)))))
 
 (dolist (x '("^No tags table in use; use .* to select one$"
             "^There is no default tag$"