diff options
| author | Alan Mackenzie | 2012-02-22 19:34:32 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2012-02-22 19:34:32 +0000 |
| commit | f41ce09dbd1e923997c93d97725b4de52d856284 (patch) | |
| tree | d4eea5d2f8e29422555fe99df9a9cfc3c4f02230 | |
| parent | 0edbf0b6fb48eb11d1e28aee898532625455e484 (diff) | |
| download | emacs-f41ce09dbd1e923997c93d97725b4de52d856284.tar.gz emacs-f41ce09dbd1e923997c93d97725b4de52d856284.zip | |
Revert Change #107149.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f025f3051e..ab39eb4d03c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-22 Alan Mackenzie <acm@muc.de> | ||
| 2 | |||
| 3 | * progmodes/cc-modes: revert change #2012-02-06T22:08:41Z!larsi@gnus.org from 2012-02-06. | ||
| 4 | |||
| 1 | 2012-02-22 Glenn Morris <rgm@gnu.org> | 5 | 2012-02-22 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * ffap.el (ffap-c-path): | 7 | * ffap.el (ffap-c-path): |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 2eb00e72a76..985214db1dc 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -1156,8 +1156,7 @@ Note that the style variables are always made local to the buffer." | |||
| 1156 | ;; `c-set-fl-decl-start' for the detailed functionality. | 1156 | ;; `c-set-fl-decl-start' for the detailed functionality. |
| 1157 | (cons (c-set-fl-decl-start beg) end)) | 1157 | (cons (c-set-fl-decl-start beg) end)) |
| 1158 | 1158 | ||
| 1159 | (defvar c-standard-font-lock-fontify-region-function | 1159 | (defvar c-standard-font-lock-fontify-region-function nil |
| 1160 | (default-value 'font-lock-fontify-region-function) | ||
| 1161 | "Standard value of `font-lock-fontify-region-function'") | 1160 | "Standard value of `font-lock-fontify-region-function'") |
| 1162 | 1161 | ||
| 1163 | (defun c-font-lock-fontify-region (beg end &optional verbose) | 1162 | (defun c-font-lock-fontify-region (beg end &optional verbose) |