Merge pull request #1559 from johanclaesson/tags2_maint

1 files changed, 21 insertions, 7 deletions

diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 9a3985541b..3eff13e1d3 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -2084,12 +2084,6 @@ This function is aware of imported functions."
            (when funcname
              (erlang-man-find-function (current-buffer) funcname))))))
 
-(defun erlang-default-function-or-module ()
-  (let ((id (erlang-get-identifier-at-point)))
-    (if (eq (erlang-id-kind id) 'qualified-function)
-        (format "%s:%s" (erlang-id-module id) (erlang-id-name id))
-      (erlang-id-name id))))
-
 
 ;; Should the defadvice be at the top level, the package `advice' would
 ;; be required.  Now it is only required when this functionality
@@ -3793,6 +3787,21 @@ of arguments could be found, otherwise nil."
   (nth 3 (erlang-id-to-list id)))
 
 
+(defun erlang-default-function-or-module ()
+  (erlang-with-id (kind module name) (erlang-get-identifier-at-point)
+    (let ((x (cond ((eq kind 'module)
+                    (format "%s:" name))
+                   ((eq kind 'record)
+                    (format "-record(%s" name))
+                   ((eq kind 'macro)
+                    (format "-define(%s" name))
+                   (t
+                    name))))
+      (if module
+          (format "%s:%s" module x)
+        x))))
+
+
 ;; TODO: Escape single quotes inside the string without
 ;; replace-regexp-in-string.
 (defun erlang-add-quotes-if-needed (str)
@@ -5000,9 +5009,10 @@ considered first when it is time to jump to the definition.")
   (and (fboundp 'xref-make)
        (fboundp 'xref-make-file-location)
        (let* ((first-time t)
+              (cbuf (current-buffer))
               xrefs matching-files)
          (save-excursion
-           (while (visit-tags-table-buffer (not first-time))
+           (while (erlang-visit-tags-table-buffer (not first-time) cbuf)
              (setq first-time nil)
              (let ((files (tags-table-files)))
                (while files
@@ -5018,6 +5028,10 @@ considered first when it is time to jump to the definition.")
                  (setq files (cdr files))))))
          (nreverse xrefs))))
 
+(defun erlang-visit-tags-table-buffer (cont cbuf)
+  (if (< emacs-major-version 26)
+      (visit-tags-table-buffer cont)
+    (visit-tags-table-buffer cont cbuf)))
 
 (defun erlang-xref-find-definitions-module-tag (module
                                                 tag