diff options
| author | Alan Mackenzie | 2020-08-29 19:29:54 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2020-08-29 19:29:54 +0000 |
| commit | dddc971f0e58e775578623eb3f026dc43bdda48a (patch) | |
| tree | 38409b72e4f9ed3c4e8ba52051443cce87dd7771 | |
| parent | 4a73fb966876ba8c8aefa24ee51448d2b44df1bf (diff) | |
| download | emacs-dddc971f0e58e775578623eb3f026dc43bdda48a.tar.gz emacs-dddc971f0e58e775578623eb3f026dc43bdda48a.zip | |
CC Mode: Fix processing for when c-multiline-string-start-char is a character
* lisp/progmodes/cc-mode.el (c-pps-to-string-delim)
(c-multiline-string-check-final-quote): Replace c-clear-char-property by
c-clear-syn-tab.
(c-multiline-string-check-final-quote): Replace c-put-char-property by
c-put-syn-tab.
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 066bec60091..74afeecf8f7 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -1163,7 +1163,7 @@ Note that the style variables are always made local to the buffer." | |||
| 1163 | (while (progn | 1163 | (while (progn |
| 1164 | (parse-partial-sexp (point) end nil nil st-s 'syntax-table) | 1164 | (parse-partial-sexp (point) end nil nil st-s 'syntax-table) |
| 1165 | (unless (bobp) | 1165 | (unless (bobp) |
| 1166 | (c-clear-char-property (1- (point)) 'syntax-table)) | 1166 | (c-clear-syn-tab (1- (point)))) |
| 1167 | (setq st-pos (point)) | 1167 | (setq st-pos (point)) |
| 1168 | (and (< (point) end) | 1168 | (and (< (point) end) |
| 1169 | (not (eq (char-before) ?\"))))) | 1169 | (not (eq (char-before) ?\"))))) |
| @@ -1196,7 +1196,7 @@ Note that the style variables are always made local to the buffer." | |||
| 1196 | t) | 1196 | t) |
| 1197 | (t | 1197 | (t |
| 1198 | ;; At a significant " | 1198 | ;; At a significant " |
| 1199 | (c-clear-char-property (1- (point)) 'syntax-table) | 1199 | (c-clear-syn-tab (1- (point))) |
| 1200 | (setq pos-ll (c-literal-limits) | 1200 | (setq pos-ll (c-literal-limits) |
| 1201 | pos-lt (c-literal-type pos-ll)) | 1201 | pos-lt (c-literal-type pos-ll)) |
| 1202 | nil))) | 1202 | nil))) |
| @@ -1204,7 +1204,7 @@ Note that the style variables are always made local to the buffer." | |||
| 1204 | (cond | 1204 | (cond |
| 1205 | ((bobp)) | 1205 | ((bobp)) |
| 1206 | ((eq pos-lt 'string) | 1206 | ((eq pos-lt 'string) |
| 1207 | (c-put-char-property (1- (point)) 'syntax-table '(15))) | 1207 | (c-put-syn-tab (1- (point)) '(15))) |
| 1208 | (t nil))))) | 1208 | (t nil))))) |
| 1209 | 1209 | ||
| 1210 | (defvar c-fl-syn-tab-region nil) | 1210 | (defvar c-fl-syn-tab-region nil) |