diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/progmodes/cc-awk.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/progmodes/cc-awk.el')
| -rw-r--r-- | lisp/progmodes/cc-awk.el | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 077a18cc597..19a95aad676 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -72,7 +72,7 @@ (modify-syntax-entry ?\# "< " st) ;; / can delimit regexes or be a division operator. By default we assume ;; that it is a division sign, and fix the regexp operator cases with - ;; `font-lock-syntactic-keywords'. + ;; `c-awk-set-syntax-table-properties'. (modify-syntax-entry ?/ "." st) ; ACM 2002/4/27. (modify-syntax-entry ?* "." st) (modify-syntax-entry ?+ "." st) @@ -785,13 +785,16 @@ ;; Scan the buffer text between point and LIM, setting (and clearing) the ;; syntax-table property where necessary. ;; -;; This function is designed to be called as the FUNCTION in a MATCHER in -;; font-lock-syntactic-keywords, and it always returns NIL (to inhibit -;; repeated calls from font-lock: See elisp info page "Search-based -;; Fontification"). It also gets called, with a bit of glue, from -;; after-change-functions when font-lock isn't active. Point is left -;; "undefined" after this function exits. THE BUFFER SHOULD HAVE BEEN -;; WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED BEFORE CALLING THIS ROUTINE. +;; This function is designed to be called as the FUNCTION in a MATCHER +;; in font-lock-syntactic-keywords, and it always returns NIL (to +;; inhibit repeated calls from font-lock: See elisp info page +;; "Search-based Fontification"). (2015-11-24: CC Mode doesn't use +;; `font-lock-syntactic-keywords' and hasn't done for a very long +;; time, if ever. ACM.) This function gets called, with a bit of +;; glue, from after-change-functions whether or not font-lock is +;; active. Point is left "undefined" after this function exits. THE +;; BUFFER SHOULD HAVE BEEN WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED +;; BEFORE CALLING THIS ROUTINE. ;; ;; We need to set/clear the syntax-table property on: ;; (i) / - It is set to "string" on a / which is the opening or closing |