procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up previous visit-tags-table change

Browse source 
* lisp/progmodes/etags.el (visit-tags-table): Reimplement
`tags--find-default-tags-dir-recursively' using the much simpler
`locate-dominating-file'. Following up bug#37518.
This commit is contained in:
Hong Xu 2019-10-09 07:03:33 +02:00 • committed by Lars Ingebrigtsen
parent e8dd6c9d83
commit 5f727c6342
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/progmodes/etags.el
View file

@ -274,19 +274,6 @@ buffer-local and set them to nil."
(setq buffer-undo-list t)
(initialize-new-tags-table))
(defun tags--find-default-tags-dir-recursively (current-dir)
"Find the directory in which the default TAGS file lives.
It is the first directory that contains a file named TAGS
encountered when recursively searching upward from CURRENT-DIR."
(let ((tag-filename (expand-file-name "TAGS" current-dir)))
(if (file-exists-p tag-filename)
current-dir
(let ((parent-dir
(file-name-directory (directory-file-name current-dir))))
(if (string= parent-dir current-dir) ;; root dir is reached
nil
(tags--find-default-tags-dir-recursively parent-dir))))))
;;;###autoload
(defun visit-tags-table (file &optional local)
"Tell tags commands to use tags table file FILE.
@ -301,7 +288,7 @@ in is given a local value of this variable which is the name of the tags
file the tag was in."
(interactive
(let ((default-tag-dir
(or (tags--find-default-tags-dir-recursively default-directory)
(or (locate-dominating-file default-directory "TAGS")
default-directory)))
(list (read-file-name
"Visit tags table (default TAGS): "