mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-07 12:10:55 +00:00
Code Issues Releases Activity

Merge from origin/emacs-24

Browse Source 
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
This commit is contained in:
Paul Eggert 2015-03-03 14:21:26 -08:00
commit 9792a944dc
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/ChangeLog
View File

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

2
admin/admin.el
View File

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

8
lisp/ChangeLog
View File

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

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

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