[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7220bbe0511: Correction to patch on 2023-06-21 15:36:56 +0000.
From: |
Alan Mackenzie |
Subject: |
master 7220bbe0511: Correction to patch on 2023-06-21 15:36:56 +0000. |
Date: |
Sun, 25 Jun 2023 11:08:50 -0400 (EDT) |
branch: master
commit 7220bbe0511e213cf142059c21bfdd63fc494f28
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>
Correction to patch on 2023-06-21 15:36:56 +0000.
This corrects an error where commenting out a template closer
left a subsequent closer without a syntax-table text property.
* lisp/progmodes/cc-engine.el (c-unmark-<>-around-region):
Don't scan from the inside of 2-character comment delimiters.
Replace invalid skip-syntax-forward call with a null string
argument by an invocation of
c-search-forward-non-nil-char-property.
---
lisp/progmodes/cc-engine.el | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0eadeafc836..c4ae8aadd65 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -7158,8 +7158,8 @@ comment at the start of cc-engine.el for more info."
(beg-literal-beg (car (cddr lit-search-beg-s)))
(lit-search-end-s (c-semi-pp-to-literal lit-search-end))
(end-literal-beg (car (cddr lit-search-end-s)))
- (beg-literal-end (c-end-of-literal lit-search-beg-s beg))
- (end-literal-end (c-end-of-literal lit-search-end-s end))
+ (beg-literal-end (c-end-of-literal lit-search-beg-s lit-search-beg))
+ (end-literal-end (c-end-of-literal lit-search-end-s lit-search-end))
new-beg new-end search-region)
;; Determine any new end of literal resulting from the
insertion/deletion.
@@ -7212,13 +7212,12 @@ comment at the start of cc-engine.el for more info."
;; Save current settings of the 'syntax-table property in
;; (BEG END), then splat these with the punctuation value.
(goto-char beg)
- (while (progn (skip-syntax-forward "" end)
- (< (point) end))
- (setq syn-tab-value
- (c-get-char-property (point) 'syntax-table))
- (when (not (c-get-char-property (point) 'category))
- (push (cons (point) syn-tab-value) syn-tab-settings))
- (forward-char))
+ (while (setq syn-tab-value
+ (c-search-forward-non-nil-char-property
+ 'syntax-table end))
+ (when (not (c-get-char-property (1- (point)) 'category))
+ (push (cons (1- (point)) syn-tab-value)
+ syn-tab-settings)))
(c-put-char-properties beg end 'syntax-table '(1))
;; If an open string's opener has just been neutralized,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 7220bbe0511: Correction to patch on 2023-06-21 15:36:56 +0000.,
Alan Mackenzie <=