Emacs: consider case in erlang-get-identifier-at-point

2 files changed, 15 insertions, 13 deletions

diff --git a/lib/tools/emacs/erlang-test.el b/lib/tools/emacs/erlang-test.el
index ca0b641791..2ee584d11a 100644
--- a/lib/tools/emacs/erlang-test.el
+++ b/lib/tools/emacs/erlang-test.el
@@ -67,7 +67,7 @@
     ("SYMBOL" . "-define(SYMBOL, value).")
     ("MACRO" . "-define(MACRO(X), X + X).")
     ("struct" . "-record(struct, {until,maps,are,everywhere}).")
-    ("function". "function() -> #struct{}."))
+    ("function" . "function() -> #struct{}."))
   "Alist of erlang test code.
 Each entry have the format (TAGNAME . ERLANG_CODE).  If TAGNAME
 is nil there is no definitions in the ERLANG_CODE.  The
@@ -147,8 +147,9 @@ concatenated to form an erlang file to test on.")
         do (when tagname
              (switch-to-buffer erlang-buffer)
              (erlang-test-xref-jump tagname erlang-file line)
-             (erlang-test-xref-jump (concat "erlang_test:" tagname)
-                                    erlang-file line)))
+             (when (string-equal tagname "function")
+               (erlang-test-xref-jump (concat "erlang_test:" tagname)
+                                      erlang-file line))))
   (erlang-test-xref-jump "erlang_test:" erlang-file 1))
 
 (defun erlang-test-xref-jump (id expected-file expected-line)
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index fc6966c3e8..3cbe9daa60 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -3697,16 +3697,17 @@ retried without regard to module.
 4. Arity - Integer in case of functions and macros if the number
 of arguments could be found, otherwise nil."
   (save-excursion
-    (save-match-data
-      (if (eq (char-syntax (following-char)) ? )
-          (skip-chars-backward " \t"))
-      (skip-chars-backward "[:word:]_:'")
-      (cond ((looking-at erlang-module-function-regexp)
-             (erlang-get-qualified-function-id-at-point))
-            ((looking-at (concat erlang-atom-regexp ":"))
-             (erlang-get-module-id-at-point))
-            ((looking-at erlang-name-regexp)
-             (erlang-get-some-other-id-at-point))))))
+    (let (case-fold-search)
+      (save-match-data
+        (if (eq (char-syntax (following-char)) ? )
+            (skip-chars-backward " \t"))
+        (skip-chars-backward "[:word:]_:'")
+        (cond ((looking-at erlang-module-function-regexp)
+               (erlang-get-qualified-function-id-at-point))
+              ((looking-at (concat erlang-atom-regexp ":"))
+               (erlang-get-module-id-at-point))
+              ((looking-at erlang-name-regexp)
+               (erlang-get-some-other-id-at-point)))))))
 
 (defun erlang-get-qualified-function-id-at-point ()
   (let ((kind 'qualified-function)