[Emacs-diffs] master 273dd65 1/2: Default FILE to the current buffer for list-tags

[Lars Ingebrigtsen]

branch: master
commit 273dd6542d96e09f90308187bac341ebaa0c770d
Author: Hong Xu <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Default FILE to the current buffer for list-tags
    
    * doc/emacs/maintaining.texi (List Identifiers): Update
    `list-tags' doc (bug#37611).
    * lisp/progmodes/etags.el (list-tags)
    (tags--get-current-buffer-name-in-tags-file): Default FILE to the
    current buffer for list-tags.
---
 doc/emacs/maintaining.texi |  4 +++-
 lisp/progmodes/etags.el    | 25 +++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 9a99570..519667d 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2124,7 +2124,9 @@ the selected tags table, and displays a list of tags 
defined in that
 file.  Do not include a directory as part of the file name unless the
 file name recorded in the tags table includes a directory.  This
 command works only with the etags backend, and requires a tags table
-for the project to be available.  @xref{Tags Tables}.
+for the project to be available.  @xref{Tags Tables}.  If used
+interactively, the default tag is file name of the current buffer if
+used interactively.
 
 @c Sadly, the new-and-improved Xref feature doesn't provide anything
 @c close to the described below features of the now-obsoleted
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index a035161..5edced5 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1852,15 +1852,28 @@ For non-interactive use, superceded by 
`fileloop-initialize-replace'."
        (all-completions string (tags-table-files) predicate)
       (try-completion string (tags-table-files) predicate))))
 
+(defun tags--get-current-buffer-name-in-tags-file ()
+  "Get the file name that the current buffer corresponds in the tags file."
+  (let ((tag-dir
+         (save-excursion
+           (visit-tags-table-buffer)
+           (file-name-directory (buffer-file-name)))))
+    (file-relative-name (buffer-file-name) tag-dir)))
+
 ;;;###autoload
 (defun list-tags (file &optional _next-match)
   "Display list of tags in file FILE.
-This searches only the first table in the list, and no included tables.
-FILE should be as it appeared in the `etags' command, usually without a
-directory specification."
-  (interactive (list (completing-read "List tags in file: "
-                                     'tags-complete-tags-table-file
-                                     nil t nil)))
+This searches only the first table in the list, and no included
+tables.  FILE should be as it appeared in the `etags' command,
+usually without a directory specification.  If called
+interactively, FILE defaults to the file name of the current
+buffer."
+  (interactive (list (completing-read
+                      "List tags in file: "
+                      'tags-complete-tags-table-file
+                      nil t
+                      ;; Default FILE to the current buffer.
+                      (tags--get-current-buffer-name-in-tags-file))))
   (with-output-to-temp-buffer "*Tags List*"
     (princ (substitute-command-keys "Tags in file `"))
     (tags-with-face 'highlight (princ file))