Merge from origin/emacs-24

d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.

Conflicts:
	admin/ChangeLog
	lisp/ChangeLog

2 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bc9b8c85ce..db1358cd2fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-03  Alan Mackenzie  <acm@muc.de>
+
+        CC Mode: Stop Font Lock forcing fontification from BOL.  Fixes
+        debbugs#19669.
+
+        * progmodes/cc-mode.el (c-font-lock-init): Setq
+        font-lock-extend-region-functions to nil.
+
 2015-03-03  Daniel Colascione  <dancol@dancol.org>
 
         * emacs-lisp/generator.el: Make globals conform to elisp
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c02192608b2..f84f4ae2c20 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1259,6 +1259,14 @@ This function is called from `c-common-init', once per mode initialization."
           (font-lock-mark-block-function
            . c-mark-function)))
 
+  ;; Prevent `font-lock-default-fontify-region' extending the region it will
+  ;; fontify to whole lines by removing `font-lock-extend-region-whole-lines'
+  ;; (and, coincidentally, `font-lock-extend-region-multiline' (which we do
+  ;; not need)) from `font-lock-extend-region-functions'.  (Emacs only).  This
+  ;; fixes Emacs bug #19669.
+  (when (boundp 'font-lock-extend-region-functions)
+    (setq font-lock-extend-region-functions nil))
+
   (make-local-variable 'font-lock-fontify-region-function)
   (setq font-lock-fontify-region-function 'c-font-lock-fontify-region)