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

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ec5005698603cb162473791f7469473fbb6dcee3..9a160446b35df9a78563b8d896da56d373be3dee 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
+       rather than webmasters@gnu.
+
 2015-01-28  Glenn Morris  <rgm@gnu.org>
 
        * update_autogen (commit): Prepend "# " to commit message.

diff --git a/admin/admin.el b/admin/admin.el
index 18ea4a40ccc37309912c06116d0c336356fe19b5..9bf503ef142f9cedbb03fa4ee02d0f80ac683dd7 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -248,7 +248,7 @@ Optional argument TYPE is type of output (nil means all)."
 
 (defconst manual-meta-string
   "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">
-<link rev=\"made\" href=\"mailto:webmasters@gnu.org\">
+<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
 <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\">
 <meta name=\"ICBM\" content=\"42.256233,-71.006581\">
 <meta name=\"DC.title\" content=\"gnu.org\">\n\n")

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bc9b8c85ceaddd22579544c3b42dd8968aea4cd..db1358cd2fef8468c5a1d8790fc9faea05761466 100644 (file)
--- 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 c02192608b292f9217b015638b6f22df5441c612..f84f4ae2c20079c8c415833861eaaa4f3307a9a6 100644 (file)
--- 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)