From d69e9f1c24f37f36af33b0468c5a4e100dbb09b6 Mon Sep 17 00:00:00 2001
From: Alan Mackenzie <acm@muc.de>
Date: Sun, 1 Feb 2015 21:20:35 +0000
Subject: [PATCH 1/2] CC Mode: Stop Font Lock forcing fontification from BOL. 
 Fixes debbugs#19669.

cc-mode.el (c-font-lock-init): Setq font-lock-extend-region-functions to
nil.
---
 lisp/ChangeLog            | 8 ++++++++
 lisp/progmodes/cc-mode.el | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd54c688640..2d4f71f6cec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-01  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-01-31  Alan Mackenzie  <acm@muc.de>
 
 	Handle "#" operator properly inside macro.  Fix coding bug.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 1cba5027f28..50a700425bf 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1237,6 +1237,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)
 

From d3852a99c99f0785425a3a4c9d48d31e9aeec7c9 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sun, 1 Feb 2015 16:55:24 -0800
Subject: [PATCH 2/2] * admin/admin.el (manual-meta-string): Use
 bug-gnu-emacs@gnu rather than webmasters@gnu

---
 admin/ChangeLog | 5 +++++
 admin/admin.el  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/ChangeLog b/admin/ChangeLog
index b1d8ed858da..f5490013544 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-02  Glenn Morris  <rgm@gnu.org>
+
+	* admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
+	rather than webmasters@gnu.
+
 2015-01-03  Glenn Morris  <rgm@gnu.org>
 
 	* update_autogen (commit): Prepend "# " to commit message.
diff --git a/admin/admin.el b/admin/admin.el
index fcdb6cb1444..bb0fbd31f13 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -297,7 +297,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")