From a5b48e25fe966ed67f314b77903335e8238ce8f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Thu, 12 Nov 2020 10:39:36 +0100 Subject: [PATCH] vhdl-mode: remove minor obstacle to static checking * lisp/progmodes/vhdl-mode.el (vhdl-directive-keywords-regexp): Remove unnecessary global variable. (vhdl-words-init): Remove assignment. (vhdl-font-lock-init): Inline expression. Use regexp-opt. --- lisp/progmodes/vhdl-mode.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 3d66483b83e..f288facba50 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -5336,9 +5336,6 @@ Key bindings: (defvar vhdl-reserved-words-regexp nil "Regexp for additional reserved words.") -(defvar vhdl-directive-keywords-regexp nil - "Regexp for compiler directive keywords.") - (defun vhdl-upcase-list (condition list) "Upcase all elements in LIST based on CONDITION." (when condition @@ -5416,9 +5413,6 @@ Key bindings: (concat vhdl-forbidden-syntax "\\|")) (regexp-opt vhdl-reserved-words) "\\)\\>")) - (setq vhdl-directive-keywords-regexp - (concat "\\<\\(" (mapconcat 'regexp-quote - vhdl-directive-keywords "\\|") "\\)\\>")) (vhdl-abbrev-list-init)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -13631,7 +13625,10 @@ This does background highlighting of translate-off regions.") vhdl-template-prompt-syntax ">\\)") 2 'vhdl-font-lock-prompt-face t) (list (concat "--\\s-*" - vhdl-directive-keywords-regexp "\\s-+\\(.*\\)$") + "\\<" + (regexp-opt vhdl-directive-keywords t) + "\\>" + "\\s-+\\(.*\\)$") 2 'vhdl-font-lock-directive-face t) ;; highlight c-preprocessor directives (list "^#[ \t]*\\(\\w+\\)\\([ \t]+\\(\\w+\\)\\)?" -- 2.39.2