summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorWilson Snyder <wsnyder@wsnyder.org>2019-05-06 18:35:31 -0400
committerWilson Snyder <wsnyder@wsnyder.org>2019-05-06 18:35:31 -0400
commit01963fbbe10d290ba037cd523d21ebbcd2536b40 (patch)
tree154514499fc49a293ba6acd7134211404db0b4bc /lisp/progmodes
parentf0c0b2cea3ffea7e3c53ff24c58e7a08ac40babb (diff)
downloademacs-01963fbbe10d290ba037cd523d21ebbcd2536b40.tar.gz
Fix verilog-mode module backticks; whitespace from prev commits.
* verilog-mode.el (verilog-read-inst-module-matcher): Work when point is near backtick. Reported by Mattias Engdegard.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/verilog-mode.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index e75e5845ef3..eeed4c0d7c8 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -121,7 +121,7 @@
;;
;; This variable will always hold the version number of the mode
-(defconst verilog-mode-version "2019-04-02-5d62d3f-vpo-GNU"
+(defconst verilog-mode-version "2019-05-06-28bee25-vpo-GNU"
"Version of this Verilog mode.")
(defconst verilog-mode-release-emacs t
"If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -2760,13 +2760,13 @@ find the errors."
(defconst verilog-delay-re "#\\s-*\\(\\([0-9_]+\\('s?[hdxbo][0-9a-fA-F_xz]+\\)?\\)\\|\\(([^()]*)\\)\\|\\(\\sw+\\)\\)")
(defconst verilog-declaration-re-2-no-macro
(concat "\\s-*" verilog-declaration-re
- "\\s-*\\(\\(" verilog-optional-signed-range-re "\\)\\|\\(" verilog-delay-re "\\)"
- "\\)"))
+ "\\s-*\\(\\(" verilog-optional-signed-range-re "\\)\\|\\(" verilog-delay-re "\\)"
+ "\\)"))
(defconst verilog-declaration-re-2-macro
(concat "\\s-*" verilog-declaration-re
- "\\s-*\\(\\(" verilog-optional-signed-range-re "\\)\\|\\(" verilog-delay-re "\\)"
- "\\|\\(" verilog-macroexp-re "\\)"
- "\\)"))
+ "\\s-*\\(\\(" verilog-optional-signed-range-re "\\)\\|\\(" verilog-delay-re "\\)"
+ "\\|\\(" verilog-macroexp-re "\\)"
+ "\\)"))
(defconst verilog-declaration-re-1-macro
(concat "^" verilog-declaration-re-2-macro))
@@ -8357,13 +8357,13 @@ Use optional HEADER and PREFIX."
(when (looking-at ")")
(verilog-backward-open-paren)
(verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_$]" nil nil))
- (skip-chars-backward "a-zA-Z0-9'_$")
+ (skip-chars-backward "a-zA-Z0-9`_$")
;; #1 is legal syntax for gate primitives
(when (save-excursion
- (verilog-backward-syntactic-ws-quick)
- (eq ?# (char-before)))
+ (verilog-backward-syntactic-ws-quick)
+ (eq ?# (char-before)))
(verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_$]" nil nil)
- (skip-chars-backward "a-zA-Z0-9'_$"))
+ (skip-chars-backward "a-zA-Z0-9`_$"))
(looking-at "[a-zA-Z0-9`_$]+")
;; Important: don't use match string, this must work with Emacs 19 font-lock on
(buffer-substring-no-properties (match-beginning 0) (match-end 0))
@@ -11412,7 +11412,7 @@ If PAR-VALUES replace final strings with these parameter values."
(when tpl-ass
;; Evaluate @"(lispcode)"
(when (string-match "@\".*[^\\]\"" tpl-net)
- (while (string-match "@\"\\(\\([^\\\"]\\|\\\\.\\)*\\)\"" tpl-net)
+ (while (string-match "@\"\\(\\([^\\\"]\\|\\\\.\\)*\\)\"" tpl-net)
(setq tpl-net
(concat
(substring tpl-net 0 (match-beginning 0))