[Emacs-diffs] master 207f119 4/4: Merge from origin/emacs-24

[Paul Eggert]

branch: master
commit 207f11935755236b21ca4d3fe6b19206e0a9ed33
Merge: 389698e 21d4bf6
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-24
    
    21d4bf6 * admin/make-tarball.txt: Copyedits.
    f3b70a7 ; ChangeLog fix
    07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL."
    
    Conflicts:
        lisp/ChangeLog
---
 admin/make-tarball.txt    |    8 +++++---
 lisp/ChangeLog            |    5 +++++
 lisp/progmodes/cc-mode.el |    8 --------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 8f8b031..e902b02 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -52,9 +52,11 @@ General steps (for each step, check for possible errors):
     number to that of the actual release.  Pick a date about a week
     from now when you intend to make the release.  Use M-x add-release-logs
     to add the ChangeLog entries for that date to the tar file (but
-    not yet to the repository).  Name the tar file as
-    emacs-XX.Y-rc1.tar.  If all goes well in the following week, you
-    can simply rename the file and use it for the actual release.
+    do not commit the entries to the repository until the actual release).
+    Name the tar file as emacs-XX.Y-rc1.tar.  If all goes well in the
+    following week, you can simply rename the file and use it for the
+    actual release.  If you need another release candidate, remember
+    to adjust the ChangeLog entries.
 
 4.   autoreconf -i -I m4 --force
      make bootstrap
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11abda5..694b346 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change
+       "Stop Font Lock forcing fontification from BOL."  (Bug#20245)
+
 2015-04-04  Artur Malabarba  <address@hidden>
 
        * emacs-lisp/package.el (package--download-and-read-archives): Add
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index d88fe70..42ee140 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1302,14 +1302,6 @@ 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)