diff options
| author | Roland McGrath | 1994-06-24 08:07:57 +0000 |
|---|---|---|
| committer | Roland McGrath | 1994-06-24 08:07:57 +0000 |
| commit | c3dea9ba0b3ac1b6b99f2ebaf5594b0404a0133c (patch) | |
| tree | 57403efc33d669903becbc2b0fb09c81bce43e61 | |
| parent | 186cf7192161e665d92e9ee09ea872dc46e2367b (diff) | |
| download | emacs-c3dea9ba0b3ac1b6b99f2ebaf5594b0404a0133c.tar.gz emacs-c3dea9ba0b3ac1b6b99f2ebaf5594b0404a0133c.zip | |
(visit-tags-table-buffer): Don't take car of return frmo
tags-table-including.
| -rw-r--r-- | lisp/progmodes/etags.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 517e6d71154..79134b09016 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el | |||
| @@ -331,10 +331,10 @@ Returns non-nil iff it is a valid table." | |||
| 331 | 331 | ||
| 332 | ;; Subroutine of visit-tags-table-buffer. Search the current tags tables | 332 | ;; Subroutine of visit-tags-table-buffer. Search the current tags tables |
| 333 | ;; for one that has tags for THIS-FILE (or that includes a table that | 333 | ;; for one that has tags for THIS-FILE (or that includes a table that |
| 334 | ;; does). Returns the tail of `tags-table-computed-list' whose car is a | 334 | ;; does). Return the name of the first table table listing THIS-FILE; if |
| 335 | ;; table listing THIS-FILE; if the table is one included by another table, | 335 | ;; the table is one included by another table, it is the master table that |
| 336 | ;; it is the master table that we return. If CORE-ONLY is non-nil, check | 336 | ;; we return. If CORE-ONLY is non-nil, check only tags tables that are |
| 337 | ;; only tags tables that are already in buffers--don't visit any new files. | 337 | ;; already in buffers--don't visit any new files. |
| 338 | (defun tags-table-including (this-file core-only) | 338 | (defun tags-table-including (this-file core-only) |
| 339 | (let ((tables tags-table-computed-list) | 339 | (let ((tables tags-table-computed-list) |
| 340 | (found nil)) | 340 | (found nil)) |
| @@ -439,12 +439,12 @@ Returns t if it visits a tags table, or nil if there are no more in the list." | |||
| 439 | ;; be frobnicated, and CONT will be set non-nil so we don't | 439 | ;; be frobnicated, and CONT will be set non-nil so we don't |
| 440 | ;; do it below. | 440 | ;; do it below. |
| 441 | (and buffer-file-name | 441 | (and buffer-file-name |
| 442 | (car (or | 442 | (or |
| 443 | ;; First check only tables already in buffers. | 443 | ;; First check only tables already in buffers. |
| 444 | (tags-table-including buffer-file-name t) | 444 | (tags-table-including buffer-file-name t) |
| 445 | ;; Since that didn't find any, now do the | 445 | ;; Since that didn't find any, now do the |
| 446 | ;; expensive version: reading new files. | 446 | ;; expensive version: reading new files. |
| 447 | (tags-table-including buffer-file-name nil)))) | 447 | (tags-table-including buffer-file-name nil))) |
| 448 | ;; Fourth, use the user variable tags-file-name, if it is | 448 | ;; Fourth, use the user variable tags-file-name, if it is |
| 449 | ;; not already in the current list. | 449 | ;; not already in the current list. |
| 450 | (and tags-file-name | 450 | (and tags-file-name |