(tags-table-including): Inside loop: if CORE-ONLY skip all consecutive

tables not in core; else extend computed list.

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 5bd9c9357613d11988e35f1c185e6960fdac98f1..ce75dfc3cca8724eaaa5dab58683f11dd0d38c88 100644 (file)
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -341,14 +341,14 @@ Returns non-nil iff it is a valid table."
     ;; Loop over the list, looking for a table containing tags for THIS-FILE.
     (while (and (not found)
                tables)
-      (and (not core-only)
-          (eq (nth 1 tables) t)
-          ;; This table has not been read into core yet.  Read it in now.
-          (tags-table-extend-computed-list))
-
-      (if (eq (nth 1 tables) t)
-         ;; Skip this table not in core.
-         (setq tables (cdr (cdr tables))))
+
+      (if core-only
+         ;; Skip tables not in core.
+         (while (eq (nth 1 tables) t)
+           (setq tables (cdr (cdr tables))))
+       (if (eq (nth 1 tables) t)
+           ;; This table has not been read into core yet.  Read it in now.
+           (tags-table-extend-computed-list)))
 
       (if tables
          ;; Select the tags table buffer and get the file list up to date.