diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f844f3f8f32..8ac8b4d94b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Liang Wang  <netcasper@gmail.com>  (tiny change)
+
+	* progmodes/etags.el (etags-list-tags): Only use tags which goto-func
+	understands (bug#9942).
+
 2012-03-22  Chong Yidong  <cyd@gnu.org>
 
 	* simple.el (end-of-visible-line): Handle return value of
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 4b337e1c15c..6bb86738df0 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1410,7 +1410,9 @@ hits the start of file."
 	  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)