[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 7380990: Remove function wrongly on AWK Mode valu
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] emacs-25 7380990: Remove function wrongly on AWK Mode value of context fontification hook. |
Date: |
Tue, 05 Jan 2016 21:17:19 +0000 |
branch: emacs-25
commit 73809908c6520208df274dfbdf10e2fa87dc2064
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
Remove function wrongly on AWK Mode value of context fontification hook.
* lisp/progmodes/cc-langs.el (c-before-context-fontification-functions):
swap order of entries so that awk's entry isn't superseded by the default.
* lisp/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct
to handle nil value of c-before-context-fontification-functions.
---
lisp/progmodes/cc-langs.el | 4 ++--
lisp/progmodes/cc-mode.el | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index d7972b4..08d84fb 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -531,8 +531,8 @@ When the mode is initialized, these functions are called
with
parameters \(point-min), \(point-max) and <buffer size>.")
(c-lang-defconst c-before-context-fontification-functions
- awk nil
- t 'c-context-expand-fl-region)
+ t 'c-context-expand-fl-region
+ awk nil)
;; For documentation see the following c-lang-defvar of the same name.
;; The value here may be a list of functions or a single function.
(c-lang-defvar c-before-context-fontification-functions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index e5be0b5..6440659 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1252,7 +1252,8 @@ Note that the style variables are always made local to
the buffer."
(save-restriction
(widen)
(save-excursion
- (let ((new-beg beg) (new-end end) new-region)
+ (let ((new-beg beg) (new-end end)
+ (new-region (cons beg end)))
(mapc (lambda (fn)
(setq new-region (funcall fn new-beg new-end))
(setq new-beg (car new-region) new-end (cdr new-region)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 7380990: Remove function wrongly on AWK Mode value of context fontification hook.,
Alan Mackenzie <=