; elisp-scope.el: Rename 'declaration' role.

* lisp/emacs-lisp/elisp-scope.el (declaration): Rename to
'function-property-declaration'.
(elisp-scope-lambda):
* lisp/progmodes/elisp-mode.el
(elisp-function-property-declaration): Update accordingly.

2 files changed, 7 insertions, 7 deletions

diff --git a/lisp/emacs-lisp/elisp-scope.el b/lisp/emacs-lisp/elisp-scope.el
index 5cb9a15f12a..f91f052fbb1 100644
--- a/lisp/emacs-lisp/elisp-scope.el
+++ b/lisp/emacs-lisp/elisp-scope.el
@@ -242,10 +242,10 @@ NAME inherits properties that do not appear in PROPS from its PARENTS."
   :imenu "Feature"
   :help (cl-constantly "Feature definition"))
 
-(elisp-scope-define-symbol-role declaration ()
-  :doc "Function attribute declaration types."
-  :face 'elisp-declaration
-  :help (cl-constantly "Declaration"))
+(elisp-scope-define-symbol-role function-property-declaration ()
+  :doc "Function/macro property declaration types."
+  :face 'elisp-function-property-declaration
+  :help (cl-constantly "Function/macro property declaration"))
 
 (elisp-scope-define-symbol-role rx-construct ()
   :doc "`rx' constructs."
@@ -637,7 +637,7 @@ Optional argument LOCAL is a local context to extend."
         (when-let* ((head (car-safe spec))
                     (bare (elisp-scope-sym-bare head)))
           (when (symbol-with-pos-p head)
-            (elisp-scope-report 'declaration
+            (elisp-scope-report 'function-property-declaration
                           (symbol-with-pos-pos head)
                           (length (symbol-name bare))))
           (cl-case bare
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index d470adba780..799236d1187 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -358,8 +358,8 @@ the role of each symbol and highlight it accordingly."
 (defface elisp-warning-type '((t :inherit font-lock-type-face))
   "Face for highlighting byte-compilation warning type names in Emacs Lisp.")
 
-(defface elisp-declaration '((t :inherit font-lock-variable-use-face))
-  "Face for highlighting function attribute declaration type names.")
+(defface elisp-function-property-declaration '((t :inherit font-lock-variable-use-face))
+  "Face for highlighting function/macro property declaration type names.")
 
 (defface elisp-thing '((t :inherit font-lock-type-face))
   "Face for highlighting `thing-at-point' \"thing\" names in Emacs Lisp.")