1 files changed, 34 insertions, 34 deletions
diff --git a/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el b/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el
index a41fb05ce18..25949c61818 100644
--- a/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el
+++ b/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el
@@ -1,7 +1,7 @@
 ;;; semantic-highlighting.el ---   -*- lexical-binding: t; -*-
 (defun foo (bar)
-;; ^ (elisp-macro-call font-lock-keyword-face)
+;; ^ (elisp-macro font-lock-keyword-face)
 ;;     ^ (elisp-defun font-lock-function-name-face)
 ;;          ^ elisp-binding-variable
  (let ((cpa current-prefix-arg))
@@ -11,42 +11,42 @@
    (or cpa (ignore bar)))
 ;;   ^ (elisp-special-form font-lock-keyword-face)
 ;;      ^ elisp-bound-variable
-;;           ^ elisp-function-reference
+;;           ^ elisp-function
 ;;                  ^ elisp-bound-variable
  )
 (add-face-text-property
-;; ^ elisp-function-reference
+;; ^ elisp-function
 (point) (mark)
-;; ^ elisp-function-reference
+;; ^ elisp-function
-;;        ^ elisp-function-reference
+;;        ^ elisp-function
 (if not-good
 ;; ^ (elisp-special-form font-lock-keyword-face)
 ;;   ^ elisp-free-variable
     'error
 ;;    ^ elisp-face
   (message "Good.")
-;;  ^ elisp-function-reference
+;;  ^ elisp-function
   'success))
 ;;  ^ elisp-face
 (require 'cl-lib)
-;; ^ (elisp-function-reference font-lock-keyword-face)
+;; ^ (elisp-function font-lock-keyword-face)
 ;;        ^ (elisp-feature font-lock-constant-face)
 ;; Taken from `completion-shorthand-try-completion' in minibuffer.el:
 (defun foobaz (string table pred point)
-;; ^ (elisp-macro-call font-lock-keyword-face)
+;; ^ (elisp-macro font-lock-keyword-face)
 ;;     ^ (elisp-defun font-lock-function-name-face)
 ;;             ^      ^     ^    ^ elisp-binding-variable
  (cl-loop with expanded
-;; ^ (elisp-macro-call font-lock-keyword-face)
+;; ^ (elisp-macro font-lock-keyword-face)
 ;;              ^ elisp-binding-variable
           for (short . long) in
 ;;              ^ elisp-binding-variable
 ;;                      ^ elisp-binding-variable
           (with-current-buffer minibuffer--original-buffer
-;;          ^ (elisp-macro-call font-lock-keyword-face)
+;;          ^ (elisp-macro font-lock-keyword-face)
 ;;                              ^ elisp-free-variable
             read-symbol-shorthands)
 ;;           ^ elisp-free-variable
@@ -54,27 +54,27 @@
 ;;             ^ elisp-binding-variable
           (and (> point (length short))
 ;;          ^ (elisp-special-form font-lock-keyword-face)
-;;               ^ elisp-function-reference
+;;               ^ elisp-function
 ;;                 ^ elisp-bound-variable
-;;                        ^ elisp-function-reference
+;;                        ^ elisp-function
 ;;                               ^ elisp-bound-variable
                (string-prefix-p short string)
-;;               ^ elisp-function-reference
+;;               ^ elisp-function
 ;;                               ^ elisp-bound-variable
 ;;                                     ^ elisp-bound-variable
                (try-completion (setq expanded
-;;               ^ elisp-function-reference
+;;               ^ elisp-function
 ;;                                ^ (elisp-special-form font-lock-keyword-face)
 ;;                                     ^ elisp-bound-variable
                                      (concat long
-;;                                     ^ elisp-function-reference
+;;                                     ^ elisp-function
 ;;                                             ^ elisp-bound-variable
                                              (substring
-;;                                             ^ elisp-function-reference
+;;                                             ^ elisp-function
                                               string
 ;;                                             ^ elisp-bound-variable
                                               (length short))))
-;;                                              ^ elisp-function-reference
+;;                                              ^ elisp-function
 ;;                                                     ^ elisp-bound-variable
                                table pred))
 ;;                              ^ elisp-bound-variable
@@ -82,44 +82,44 @@
           when probe
 ;;              ^ elisp-bound-variable
           do (message "Shorthand expansion")
-;;             ^ elisp-function-reference
+;;             ^ elisp-function
           and return (cons expanded (max (length long)
-;;                     ^ elisp-function-reference
+;;                     ^ elisp-function
 ;;                          ^ elisp-bound-variable
-;;                                    ^ elisp-function-reference
+;;                                    ^ elisp-function
-;;                                         ^ elisp-function-reference
+;;                                         ^ elisp-function
 ;;                                                ^ elisp-bound-variable
                                          (+ (- point (length short))
-;;                                         ^ elisp-function-reference
+;;                                         ^ elisp-function
-;;                                            ^ elisp-function-reference
+;;                                            ^ elisp-function
-;;                                                     ^ elisp-function-reference
+;;                                                     ^ elisp-function
 ;;                                                            ^ elisp-bound-variable
                                             (length long))))))
-;;                                            ^ elisp-function-reference
+;;                                            ^ elisp-function
 ;;                                                   ^ elisp-bound-variable
 (let ((foo 'bar))
 ;; ^ (elisp-special-form font-lock-keyword-face)
 ;;     ^ elisp-binding-variable
  (cl-flet ((foo () 'baz))
-;; ^ (elisp-macro-call font-lock-keyword-face)
+;; ^ (elisp-macro font-lock-keyword-face)
-;;           ^ elisp-function-reference
+;;           ^ elisp-function
    (foo)
-;;   ^ elisp-function-reference
+;;   ^ elisp-function
    (cl-macrolet ((foo () 'foo))
-;;   ^ (elisp-macro-call font-lock-keyword-face)
+;;   ^ (elisp-macro font-lock-keyword-face)
-;;                 ^ elisp-macro-call
+;;                 ^ elisp-macro
      (foo))))
-;;     ^ elisp-macro-call
+;;     ^ elisp-macro
 (when-let* ((foo (symbol-at-point))
-;; ^ (elisp-macro-call font-lock-keyword-face)
+;; ^ (elisp-macro font-lock-keyword-face)
 ;;           ^ elisp-binding-variable
-;;                ^ elisp-function-reference
+;;                ^ elisp-function
            current-prefix-arg
 ;;          ^ elisp-shadowing-variable
            ((commandp foo)))
-;;            ^ elisp-function-reference
+;;            ^ elisp-function
 ;;                     ^ elisp-bound-variable
  foo)
 ;; ^ elisp-bound-variable

diff --git a/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el b/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el index a41fb05ce18..25949c61818 100644 --- a/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el +++ b/test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el
@@ -1,7 +1,7 @@
1	;;; semantic-highlighting.el --- -- lexical-binding: t; --	1	;;; semantic-highlighting.el --- -- lexical-binding: t; --
2		2
3	(defun foo (bar)	3	(defun foo (bar)
4	;; ^ (elisp-macro-call font-lock-keyword-face)	4	;; ^ (elisp-macro font-lock-keyword-face)
5	;; ^ (elisp-defun font-lock-function-name-face)	5	;; ^ (elisp-defun font-lock-function-name-face)
6	;; ^ elisp-binding-variable	6	;; ^ elisp-binding-variable
7	(let ((cpa current-prefix-arg))	7	(let ((cpa current-prefix-arg))
@@ -11,42 +11,42 @@
11	(or cpa (ignore bar)))	11	(or cpa (ignore bar)))
12	;; ^ (elisp-special-form font-lock-keyword-face)	12	;; ^ (elisp-special-form font-lock-keyword-face)
13	;; ^ elisp-bound-variable	13	;; ^ elisp-bound-variable
14	;; ^ elisp-function-reference	14	;; ^ elisp-function
15	;; ^ elisp-bound-variable	15	;; ^ elisp-bound-variable
16	)	16	)
17		17
18	(add-face-text-property	18	(add-face-text-property
19	;; ^ elisp-function-reference	19	;; ^ elisp-function
20	(point) (mark)	20	(point) (mark)
21	;; ^ elisp-function-reference	21	;; ^ elisp-function
22	;; ^ elisp-function-reference	22	;; ^ elisp-function
23	(if not-good	23	(if not-good
24	;; ^ (elisp-special-form font-lock-keyword-face)	24	;; ^ (elisp-special-form font-lock-keyword-face)
25	;; ^ elisp-free-variable	25	;; ^ elisp-free-variable
26	'error	26	'error
27	;; ^ elisp-face	27	;; ^ elisp-face
28	(message "Good.")	28	(message "Good.")
29	;; ^ elisp-function-reference	29	;; ^ elisp-function
30	'success))	30	'success))
31	;; ^ elisp-face	31	;; ^ elisp-face
32		32
33	(require 'cl-lib)	33	(require 'cl-lib)
34	;; ^ (elisp-function-reference font-lock-keyword-face)	34	;; ^ (elisp-function font-lock-keyword-face)
35	;; ^ (elisp-feature font-lock-constant-face)	35	;; ^ (elisp-feature font-lock-constant-face)
36		36
37	;; Taken from `completion-shorthand-try-completion' in minibuffer.el:	37	;; Taken from `completion-shorthand-try-completion' in minibuffer.el:
38	(defun foobaz (string table pred point)	38	(defun foobaz (string table pred point)
39	;; ^ (elisp-macro-call font-lock-keyword-face)	39	;; ^ (elisp-macro font-lock-keyword-face)
40	;; ^ (elisp-defun font-lock-function-name-face)	40	;; ^ (elisp-defun font-lock-function-name-face)
41	;; ^ ^ ^ ^ elisp-binding-variable	41	;; ^ ^ ^ ^ elisp-binding-variable
42	(cl-loop with expanded	42	(cl-loop with expanded
43	;; ^ (elisp-macro-call font-lock-keyword-face)	43	;; ^ (elisp-macro font-lock-keyword-face)
44	;; ^ elisp-binding-variable	44	;; ^ elisp-binding-variable
45	for (short . long) in	45	for (short . long) in
46	;; ^ elisp-binding-variable	46	;; ^ elisp-binding-variable
47	;; ^ elisp-binding-variable	47	;; ^ elisp-binding-variable
48	(with-current-buffer minibuffer--original-buffer	48	(with-current-buffer minibuffer--original-buffer
49	;; ^ (elisp-macro-call font-lock-keyword-face)	49	;; ^ (elisp-macro font-lock-keyword-face)
50	;; ^ elisp-free-variable	50	;; ^ elisp-free-variable
51	read-symbol-shorthands)	51	read-symbol-shorthands)
52	;; ^ elisp-free-variable	52	;; ^ elisp-free-variable
@@ -54,27 +54,27 @@
54	;; ^ elisp-binding-variable	54	;; ^ elisp-binding-variable
55	(and (> point (length short))	55	(and (> point (length short))
56	;; ^ (elisp-special-form font-lock-keyword-face)	56	;; ^ (elisp-special-form font-lock-keyword-face)
57	;; ^ elisp-function-reference	57	;; ^ elisp-function
58	;; ^ elisp-bound-variable	58	;; ^ elisp-bound-variable
59	;; ^ elisp-function-reference	59	;; ^ elisp-function
60	;; ^ elisp-bound-variable	60	;; ^ elisp-bound-variable
61	(string-prefix-p short string)	61	(string-prefix-p short string)
62	;; ^ elisp-function-reference	62	;; ^ elisp-function
63	;; ^ elisp-bound-variable	63	;; ^ elisp-bound-variable
64	;; ^ elisp-bound-variable	64	;; ^ elisp-bound-variable
65	(try-completion (setq expanded	65	(try-completion (setq expanded
66	;; ^ elisp-function-reference	66	;; ^ elisp-function
67	;; ^ (elisp-special-form font-lock-keyword-face)	67	;; ^ (elisp-special-form font-lock-keyword-face)
68	;; ^ elisp-bound-variable	68	;; ^ elisp-bound-variable
69	(concat long	69	(concat long
70	;; ^ elisp-function-reference	70	;; ^ elisp-function
71	;; ^ elisp-bound-variable	71	;; ^ elisp-bound-variable
72	(substring	72	(substring
73	;; ^ elisp-function-reference	73	;; ^ elisp-function
74	string	74	string
75	;; ^ elisp-bound-variable	75	;; ^ elisp-bound-variable
76	(length short))))	76	(length short))))
77	;; ^ elisp-function-reference	77	;; ^ elisp-function
78	;; ^ elisp-bound-variable	78	;; ^ elisp-bound-variable
79	table pred))	79	table pred))
80	;; ^ elisp-bound-variable	80	;; ^ elisp-bound-variable
@@ -82,44 +82,44 @@
82	when probe	82	when probe
83	;; ^ elisp-bound-variable	83	;; ^ elisp-bound-variable
84	do (message "Shorthand expansion")	84	do (message "Shorthand expansion")
85	;; ^ elisp-function-reference	85	;; ^ elisp-function
86	and return (cons expanded (max (length long)	86	and return (cons expanded (max (length long)
87	;; ^ elisp-function-reference	87	;; ^ elisp-function
88	;; ^ elisp-bound-variable	88	;; ^ elisp-bound-variable
89	;; ^ elisp-function-reference	89	;; ^ elisp-function
90	;; ^ elisp-function-reference	90	;; ^ elisp-function
91	;; ^ elisp-bound-variable	91	;; ^ elisp-bound-variable
92	(+ (- point (length short))	92	(+ (- point (length short))
93	;; ^ elisp-function-reference	93	;; ^ elisp-function
94	;; ^ elisp-function-reference	94	;; ^ elisp-function
95	;; ^ elisp-function-reference	95	;; ^ elisp-function
96	;; ^ elisp-bound-variable	96	;; ^ elisp-bound-variable
97	(length long))))))	97	(length long))))))
98	;; ^ elisp-function-reference	98	;; ^ elisp-function
99	;; ^ elisp-bound-variable	99	;; ^ elisp-bound-variable
100		100
101	(let ((foo 'bar))	101	(let ((foo 'bar))
102	;; ^ (elisp-special-form font-lock-keyword-face)	102	;; ^ (elisp-special-form font-lock-keyword-face)
103	;; ^ elisp-binding-variable	103	;; ^ elisp-binding-variable
104	(cl-flet ((foo () 'baz))	104	(cl-flet ((foo () 'baz))
105	;; ^ (elisp-macro-call font-lock-keyword-face)	105	;; ^ (elisp-macro font-lock-keyword-face)
106	;; ^ elisp-function-reference	106	;; ^ elisp-function
107	(foo)	107	(foo)
108	;; ^ elisp-function-reference	108	;; ^ elisp-function
109	(cl-macrolet ((foo () 'foo))	109	(cl-macrolet ((foo () 'foo))
110	;; ^ (elisp-macro-call font-lock-keyword-face)	110	;; ^ (elisp-macro font-lock-keyword-face)
111	;; ^ elisp-macro-call	111	;; ^ elisp-macro
112	(foo))))	112	(foo))))
113	;; ^ elisp-macro-call	113	;; ^ elisp-macro
114		114
115	(when-let* ((foo (symbol-at-point))	115	(when-let* ((foo (symbol-at-point))
116	;; ^ (elisp-macro-call font-lock-keyword-face)	116	;; ^ (elisp-macro font-lock-keyword-face)
117	;; ^ elisp-binding-variable	117	;; ^ elisp-binding-variable
118	;; ^ elisp-function-reference	118	;; ^ elisp-function
119	current-prefix-arg	119	current-prefix-arg
120	;; ^ elisp-shadowing-variable	120	;; ^ elisp-shadowing-variable
121	((commandp foo)))	121	((commandp foo)))
122	;; ^ elisp-function-reference	122	;; ^ elisp-function
123	;; ^ elisp-bound-variable	123	;; ^ elisp-bound-variable
124	foo)	124	foo)
125	;; ^ elisp-bound-variable	125	;; ^ elisp-bound-variable