diff options
Diffstat (limited to 'lisp/progmodes/vhdl-mode.el')
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 39819131010..f288facba50 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -2304,10 +2304,6 @@ Ignore byte-compiler warnings you might see." (defvaralias 'vhdl-last-input-event 'last-input-char) (defvaralias 'vhdl-last-input-event 'last-input-event)) -;; `help-print-return-message' changed to `print-help-return-message' in Emacs -;;;(unless (fboundp 'help-print-return-message) -;;; (defalias 'help-print-return-message 'print-help-return-message)) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Compatibility with older VHDL Mode versions @@ -5340,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 @@ -5420,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)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -13635,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+\\)\\)?" @@ -16148,7 +16141,7 @@ expansion function)." ;; initialize speedbar (if (not (boundp 'speedbar-frame)) - (add-hook 'speedbar-load-hook 'vhdl-speedbar-initialize) + (with-no-warnings (add-hook 'speedbar-load-hook 'vhdl-speedbar-initialize)) (vhdl-speedbar-initialize) (when speedbar-frame (vhdl-speedbar-refresh))) |