diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:28:16 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:28:16 -0800 |
| commit | 50f3949119cd5bb2f058b90d14b2940a3a8a7a0e (patch) | |
| tree | 30c689b699955bd45e493e6be9d755889a8aa146 /lisp/progmodes/cc-mode.el | |
| parent | c63ce13206de9a6d4018e97b98b1f6966ee666d8 (diff) | |
| parent | 33d159c36f42cadccb02d95099bafac26458d3e8 (diff) | |
| download | emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.tar.gz emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.tar.bz2 emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.zip | |
Merge from origin/emacs-27
33d159c36f Fix copyright years by hand
Diffstat (limited to 'lisp/progmodes/cc-mode.el')
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 0f37db6a5ed..cfb23d0d45e 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -731,8 +731,8 @@ that requires a literal mode spec at compile time." ;; ;; Put submode indicators onto minor-mode-alist, but only once. ;; (or (assq 'c-submode-indicators minor-mode-alist) ;; (setq minor-mode-alist -;; (cons '(c-submode-indicators c-submode-indicators) -;; minor-mode-alist))) +;; (cons '(c-submode-indicators c-submode-indicators) +;; minor-mode-alist))) (c-update-modeline) ;; Install the functions that ensure that various internal caches @@ -1258,7 +1258,7 @@ Note that the style variables are always made local to the buffer." ;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to ;; VALUE (which should not be nil). ;; `(let ((-pos- ,pos) - ;; (-value- ,value)) + ;; (-value- ,value)) (c-put-char-property pos 'syntax-table value) (c-put-char-property pos 'c-fl-syn-tab value) (cond @@ -1488,7 +1488,7 @@ Note that the style variables are always made local to the buffer." ((and (c-is-escaped end) (or (eq beg end) ; .... by inserting stuff between \ and \n? - (c-will-be-unescaped beg))) ; ... by removing an odd number of \s? + (c-will-be-unescaped beg))) ; ... by removing an odd number of \s? (goto-char (1+ end))) ; To after the NL which is being unescaped. (t (goto-char end))) |