From: Hong Xu <hong@topbug.net>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 37518@debbugs.gnu.org
Subject: bug#37518: [PATCH] Search upward from current dir for the default TAGS file
Date: Sun, 6 Oct 2019 21:48:52 -0700 [thread overview]
Message-ID: <a1e225e0-6f3d-ba20-00b8-57e45aa55691@topbug.net> (raw)
In-Reply-To: <87imp19ohm.fsf@gnus.org>
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Thanks. I've attached an updated patch below.
On 10/6/19 9:19 PM, Lars Ingebrigtsen wrote:
>
>> +(defun tags--find-default-tags-dir-impl (current-dir)
>
> We don't really call functions for "-impl" or the like -- as this
> recurses upwards, what about calling it something more descriptive like
> `tags--find-default-tags-dir-recursively'?
Makes sense.
>
> This is basically
>
> (or (tags--find-default-tags-dir-impl default-directory)
> default-directory)
>
> so I don't think this intermediary function is needed.
How could I forget the magical "or" :)
[-- Attachment #2: 0001-Search-upward-from-current-dir-for-the-default-TAGS-.patch --]
[-- Type: text/x-patch, Size: 3734 bytes --]
From db1a9407f427c9d08957b9552560ff9dbb753c48 Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Sun, 6 Oct 2019 21:42:57 -0700
Subject: [PATCH] Search upward from current dir for the default TAGS file
* lisp/progmodes/etags.el (tags--find-default-tags-dir-recursively)
(visit-tags-table): Search upward from current dir for the default
TAGS file
* doc/emacs/maintaining.texi (Select Tags Table): Update the doc
of `visit-tags-table'.
---
doc/emacs/maintaining.texi | 11 ++++++-----
lisp/progmodes/etags.el | 31 +++++++++++++++++++++++++------
2 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 519667dfbe92..9d1da2ee497a 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2666,11 +2666,12 @@ Select Tags Table
@subsection Selecting a Tags Table
@findex visit-tags-table
- Emacs has at any time at most one @dfn{selected} tags table. All the
-commands for working with tags tables use the selected one. To select
-a tags table, type @kbd{M-x visit-tags-table}, which reads the tags
-table file name as an argument, with @file{TAGS} in the default
-directory as the default.
+ Emacs has at any time at most one @dfn{selected} tags table. All
+the commands for working with tags tables use the selected one. To
+select a tags table, type @kbd{M-x visit-tags-table}, which reads the
+tags table file name as an argument, with @file{TAGS} defaulting to
+the first directory that contains a file named TAGS encountered when
+recursively searching upward from the default directory.
@vindex tags-file-name
Emacs does not actually read in the tags table contents until you
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index c40422dbc5c3..5cc62543415f 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -274,6 +274,19 @@ tags-table-mode
(setq buffer-undo-list t)
(initialize-new-tags-table))
+(defun tags--find-default-tags-dir-recursively (current-dir)
+ "Find the directory that hosts the default TAGS file.
+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.
@@ -286,12 +299,18 @@ visit-tags-table
When you find a tag with \\[find-tag], the buffer it finds the tag
in is given a local value of this variable which is the name of the tags
file the tag was in."
- (interactive (list (read-file-name "Visit tags table (default TAGS): "
- default-directory
- (expand-file-name "TAGS"
- default-directory)
- t)
- current-prefix-arg))
+ (interactive
+ (let ((default-tag-dir
+ (or (tags--find-default-tags-dir-recursively default-directory)
+ default-directory)))
+ (list (read-file-name
+ "Visit tags table (default TAGS): "
+ ;; default to TAGS from default-directory up to root.
+ default-tag-dir
+ (expand-file-name "TAGS" default-tag-dir)
+ t)))
+ current-prefix-arg)
+
(or (stringp file) (signal 'wrong-type-argument (list 'stringp file)))
;; Bind tags-file-name so we can control below whether the local or
;; global value gets set.
--
2.20.1
next prev parent reply other threads:[~2019-10-07 4:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 9:52 bug#37518: [PATCH] Search upward from current dir for the default TAGS file Hong Xu
2019-10-07 4:19 ` Lars Ingebrigtsen
2019-10-07 4:48 ` Hong Xu [this message]
2019-10-07 16:24 ` Eli Zaretskii
2019-10-07 17:36 ` Hong Xu
2019-10-07 18:43 ` Eli Zaretskii
2019-10-07 18:52 ` Hong Xu
2019-10-08 16:45 ` Lars Ingebrigtsen
2019-10-08 19:46 ` Phil Sainty
2019-10-09 0:38 ` Hong Xu
2019-10-09 5:01 ` Hong Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a1e225e0-6f3d-ba20-00b8-57e45aa55691@topbug.net \
--to=hong@topbug.net \
--cc=37518@debbugs.gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.