procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-24

Browse source 
21d4bf6 * admin/make-tarball.txt: Copyedits.
f3b70a7 ; ChangeLog fix
07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL."

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Paul Eggert 2015-04-04 15:02:09 -07:00
commit 207f119357
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin/make-tarball.txt
View file

@ -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

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-04 Alan Mackenzie <acm@muc.de>
* 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 <bruce.connor.am@gmail.com>
* emacs-lisp/package.el (package--download-and-read-archives): Add

8
lisp/progmodes/cc-mode.el
View file

@ -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)