diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-08-31 10:45:54 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-08-31 10:45:54 -0700 |
| commit | 2f797124c303627a4543354eb18323e1e22e578e (patch) | |
| tree | cfc75cfcab46326bfad98c24e3d506c547a665db /lisp | |
| parent | 01b5617731990ead964e24ba6926d4d681192b4c (diff) | |
| parent | f20169399df9c6c884ae597d1737ad230ecb7f5e (diff) | |
| download | emacs-2f797124c303627a4543354eb18323e1e22e578e.tar.gz | |
Merge from origin/emacs-27
f20169399d (origin/emacs-27) Fix typo in Introduction to Emacs Lisp
7605060d51 Update Elisp Manual reference to which-function-mode
29708cbde7 Some precisions to bug handling
dddc971f0e CC Mode: Fix processing for when c-multiline-string-start-...
4a73fb9668 Fix description of %-constructs in 'mode-line-format'
Diffstat (limited to 'lisp')
| -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 81bcd101fe4..2ffbde99aa4 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1204,7 +1204,7 @@ Note that the style variables are always made local to the buffer." (while (progn (parse-partial-sexp (point) end nil nil st-s 'syntax-table) (unless (bobp) - (c-clear-char-property (1- (point)) 'syntax-table)) + (c-clear-syn-tab (1- (point)))) (setq st-pos (point)) (and (< (point) end) (not (eq (char-before) ?\"))))) @@ -1237,7 +1237,7 @@ Note that the style variables are always made local to the buffer." t) (t ;; At a significant " - (c-clear-char-property (1- (point)) 'syntax-table) + (c-clear-syn-tab (1- (point))) (setq pos-ll (c-literal-limits) pos-lt (c-literal-type pos-ll)) nil))) @@ -1245,7 +1245,7 @@ Note that the style variables are always made local to the buffer." (cond ((bobp)) ((eq pos-lt 'string) - (c-put-char-property (1- (point)) 'syntax-table '(15))) + (c-put-syn-tab (1- (point)) '(15))) (t nil))))) (defun c-put-syn-tab (pos value) |