aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen2012-02-06 23:08:41 +0100
committerLars Ingebrigtsen2012-02-06 23:08:41 +0100
commit5cc59a37897852e81e69dc630396785bddab03dd (patch)
tree363dea2b2fa15bceebc3845723dd3e9b21497a58 /lisp
parent155628057e1fc9dee052303df2ab7ff1ee5f08a8 (diff)
downloademacs-5cc59a37897852e81e69dc630396785bddab03dd.tar.gz
emacs-5cc59a37897852e81e69dc630396785bddab03dd.zip
Allow calling C fontification while rendering MIME parts
* progmodes/cc-mode.el (c-standard-font-lock-fontify-region-function): Set the default at load time, too, so that `font-lock-fontify-buffer' can be called without setting up the entire mode first. This fixes a bug in `mm-inline-text' with C MIME parts.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/progmodes/cc-mode.el3
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46849087958..2f21d9e046e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12012-02-06 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * progmodes/cc-mode.el
4 (c-standard-font-lock-fontify-region-function): Set the default at
5 load time, too, so that `font-lock-fontify-buffer' can be called
6 without setting up the entire mode first. This fixes a bug in
7 `mm-inline-text' with C MIME parts.
8
12012-02-06 Chong Yidong <cyd@gnu.org> 92012-02-06 Chong Yidong <cyd@gnu.org>
2 10
3 * simple.el (list-processes--refresh): Delete exited processes 11 * simple.el (list-processes--refresh): Delete exited processes
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0c86b68f1d9..374c9b434d1 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1155,7 +1155,8 @@ Note that the style variables are always made local to the buffer."
1155 ;; `c-set-fl-decl-start' for the detailed functionality. 1155 ;; `c-set-fl-decl-start' for the detailed functionality.
1156 (cons (c-set-fl-decl-start beg) end)) 1156 (cons (c-set-fl-decl-start beg) end))
1157 1157
1158(defvar c-standard-font-lock-fontify-region-function nil 1158(defvar c-standard-font-lock-fontify-region-function
1159 (default-value 'font-lock-fontify-region-function)
1159 "Standard value of `font-lock-fontify-region-function'") 1160 "Standard value of `font-lock-fontify-region-function'")
1160 1161
1161(defun c-font-lock-fontify-region (beg end &optional verbose) 1162(defun c-font-lock-fontify-region (beg end &optional verbose)