[Emacs-diffs] master 9792a94 02/14: Merge from origin/emacs-24

[Paul Eggert]

branch: master
commit 9792a944dcf08a246bf2618b2a5bee906a888069
Merge: 8b990b8 d3852a9
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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
---
 admin/ChangeLog           |    5 +++++
 admin/admin.el            |    2 +-
 lisp/ChangeLog            |    8 ++++++++
 lisp/progmodes/cc-mode.el |    8 ++++++++
 4 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ec50056..9a16044 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Glenn Morris  <address@hidden>
+
+       * admin.el (manual-meta-string): Use address@hidden email address
+       rather than address@hidden
+
 2015-01-28  Glenn Morris  <address@hidden>
 
        * update_autogen (commit): Prepend "# " to commit message.
diff --git a/admin/admin.el b/admin/admin.el
index 18ea4a4..9bf503e 100644
--- 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:address@hidden";>
+<link rev=\"made\" href=\"mailto:address@hidden";>
 <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 3bc9b8c..db1358c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-03  Alan Mackenzie  <address@hidden>
+
+       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  <address@hidden>
 
        * emacs-lisp/generator.el: Make globals conform to elisp
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c021926..f84f4ae 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)