[Emacs-diffs] /srv/bzr/emacs/trunk r107656: * lisp/progmodes/etags.el (etags-list-tags): Only use tags which goto-func

[Stefan Monnier]

------------------------------------------------------------
revno: 107656
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9942
author: Liang Wang <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-03-22 10:46:05 -0400
message:
  * lisp/progmodes/etags.el (etags-list-tags): Only use tags which goto-func
  understands.
modified:
  lisp/ChangeLog
  lisp/progmodes/etags.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-22 07:38:05 +0000
+++ b/lisp/ChangeLog    2012-03-22 14:46:05 +0000
@@ -1,3 +1,8 @@
+2012-03-22  Liang Wang  <address@hidden>  (tiny change)
+
+       * progmodes/etags.el (etags-list-tags): Only use tags which goto-func
+       understands (bug#9942).
+
 2012-03-22  Chong Yidong  <address@hidden>
 
        * simple.el (end-of-visible-line): Handle return value of

=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el   2012-03-21 17:50:28 +0000
+++ b/lisp/progmodes/etags.el   2012-03-22 14:46:05 +0000
@@ -1410,7 +1410,9 @@
          tag tag-info pt)
     (forward-line 1)
     (while (not (or (eobp) (looking-at "\f")))
-      (setq tag-info (save-excursion (funcall snarf-tag-function t))
+      ;; We used to use explicit tags when available, but the current goto-func
+      ;; can only handle implicit tags.
+      (setq tag-info (save-excursion (funcall snarf-tag-function nil))
            tag (car tag-info)
            pt (with-current-buffer standard-output (point)))
       (princ tag)