branch: externals/dash commit 7950bc87a3acc8605364d09f0668d66a2461cf65 Author: Basil L. Contovounesios <ba...@contovou.net> Commit: Basil L. Contovounesios <ba...@contovou.net>
Avoid obsolete font-lock face variables Emacs 31 obsoletes the variables in preference to the face symbols. * dash.el (dash--keywords): Replace obsolete font-lock variables with corresponding face symbols. Use (MATCHER . FACESPEC) in place of (MATCHER . SUBEXP-HIGHLIGHTER) with SUBEXP zero. --- dash.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dash.el b/dash.el index b1aa2c6bf1..04cd6236ab 100644 --- a/dash.el +++ b/dash.el @@ -3953,13 +3953,13 @@ This function satisfies the following laws: `(;; TODO: Do not fontify the following automatic variables ;; globally; detect and limit to their local anaphoric scope. (,(rx symbol-start (| "acc" "it" "it-index" "other") symbol-end) - 0 font-lock-variable-name-face) + . 'font-lock-variable-name-face) ;; Macros in dev/examples.el. Based on `lisp-mode-symbol-regexp'. (,(rx ?\( (group (| "defexamples" "def-example-group")) symbol-end (+ (in "\t ")) (group (* (| (syntax word) (syntax symbol) (: ?\\ nonl))))) - (1 font-lock-keyword-face) - (2 font-lock-function-name-face)) + (1 'font-lock-keyword-face) + (2 'font-lock-function-name-face)) ;; Symbols in dev/examples.el. ,(rx symbol-start (| "=>" "~>" "!!>") symbol-end) ;; Elisp macro fontification was static prior to Emacs 25.