[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e8fd3a2a2d 02/14: Merge from origin/emacs-28
From: |
Eli Zaretskii |
Subject: |
master e8fd3a2a2d 02/14: Merge from origin/emacs-28 |
Date: |
Sat, 16 Apr 2022 14:06:43 -0400 (EDT) |
branch: master
commit e8fd3a2a2da1d339cc541aace95823376ccd52a2
Merge: d64ad72bcc 8c71ac606e
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-28
8c71ac606e Fix fallout from lexical-binding in vhdl-mode.el
---
lisp/progmodes/vhdl-mode.el | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index c6693b4de5..642aad509c 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -8396,30 +8396,30 @@ buffer."
((visible-list (vhdl-get-visible-signals))
;; define syntactic regions where signals are read
(scan-regions-list
- '(;; right-hand side of signal/variable assignment
+ `(;; right-hand side of signal/variable assignment
;; (special case: "<=" is relational operator in a condition)
- ((vhdl-re-search-forward "[<:]=" proc-end t)
- (vhdl-re-search-forward
";\\|\\<\\(then\\|loop\\|report\\|severity\\|is\\)\\>" proc-end t))
+ ((vhdl-re-search-forward "[<:]=" ,proc-end t)
+ (vhdl-re-search-forward
";\\|\\<\\(then\\|loop\\|report\\|severity\\|is\\)\\>" ,proc-end t))
;; if condition
- ((vhdl-re-search-forward "^\\s-*if\\>" proc-end t)
- (vhdl-re-search-forward "\\<then\\>" proc-end t))
+ ((vhdl-re-search-forward "^\\s-*if\\>" ,proc-end t)
+ (vhdl-re-search-forward "\\<then\\>" ,proc-end t))
;; elsif condition
- ((vhdl-re-search-forward "\\<elsif\\>" proc-end t)
- (vhdl-re-search-forward "\\<then\\>" proc-end t))
+ ((vhdl-re-search-forward "\\<elsif\\>" ,proc-end t)
+ (vhdl-re-search-forward "\\<then\\>" ,proc-end t))
;; while loop condition
- ((vhdl-re-search-forward "^\\s-*while\\>" proc-end t)
- (vhdl-re-search-forward "\\<loop\\>" proc-end t))
+ ((vhdl-re-search-forward "^\\s-*while\\>" ,proc-end t)
+ (vhdl-re-search-forward "\\<loop\\>" ,proc-end t))
;; exit/next condition
- ((vhdl-re-search-forward
"\\<\\(exit\\|next\\)\\s-+\\w+\\s-+when\\>" proc-end t)
- (vhdl-re-search-forward ";" proc-end t))
+ ((vhdl-re-search-forward
"\\<\\(exit\\|next\\)\\s-+\\w+\\s-+when\\>" ,proc-end t)
+ (vhdl-re-search-forward ";" ,proc-end t))
;; assert condition
- ((vhdl-re-search-forward "\\<assert\\>" proc-end t)
- (vhdl-re-search-forward
"\\(\\<report\\>\\|\\<severity\\>\\|;\\)" proc-end t))
+ ((vhdl-re-search-forward "\\<assert\\>" ,proc-end t)
+ (vhdl-re-search-forward
"\\(\\<report\\>\\|\\<severity\\>\\|;\\)" ,proc-end t))
;; case expression
- ((vhdl-re-search-forward "^\\s-*case\\>" proc-end t)
- (vhdl-re-search-forward "\\<is\\>" proc-end t))
+ ((vhdl-re-search-forward "^\\s-*case\\>" ,proc-end t)
+ (vhdl-re-search-forward "\\<is\\>" ,proc-end t))
;; parameter list of procedure call, array index
- ((and (re-search-forward "^\\s-*\\(\\w\\|\\.\\)+[ \t\n\r\f]*("
proc-end t)
+ ((and (re-search-forward "^\\s-*\\(\\w\\|\\.\\)+[ \t\n\r\f]*("
,proc-end t)
(1- (point)))
(progn (backward-char) (forward-sexp)
(while (looking-at "(") (forward-sexp)) (point)))))
- master updated (6831008a27 -> 79f2494680), Eli Zaretskii, 2022/04/16
- master e8fd3a2a2d 02/14: Merge from origin/emacs-28,
Eli Zaretskii <=
- master d64ad72bcc 01/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master cb953504ab 07/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 25db9dfae0 09/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master bf7fc3efbf 13/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 6339fcffa1 05/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 44ba0270b7 12/14: Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 79f2494680 14/14: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Eli Zaretskii, 2022/04/16
- master e888cee1f9 03/14: ; Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 5890b80bca 06/14: Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16
- master 8804dfdb1a 08/14: Merge from origin/emacs-28, Eli Zaretskii, 2022/04/16