Commit 9792a944 authored by Paul Eggert's avatar Paul Eggert

Merge from origin/emacs-24

d3852a99 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1c CC Mode: Stop Font Lock forcing fontification from BOL.

Conflicts:
	admin/ChangeLog
	lisp/ChangeLog
parents 8b990b89 d3852a99
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> 2015-01-28 Glenn Morris <rgm@gnu.org>
* update_autogen (commit): Prepend "# " to commit message. * update_autogen (commit): Prepend "# " to commit message.
......
...@@ -248,7 +248,7 @@ Optional argument TYPE is type of output (nil means all)." ...@@ -248,7 +248,7 @@ Optional argument TYPE is type of output (nil means all)."
(defconst manual-meta-string (defconst manual-meta-string
"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"> "<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\"> <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\">
<meta name=\"ICBM\" content=\"42.256233,-71.006581\"> <meta name=\"ICBM\" content=\"42.256233,-71.006581\">
<meta name=\"DC.title\" content=\"gnu.org\">\n\n") <meta name=\"DC.title\" content=\"gnu.org\">\n\n")
......
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> 2015-03-03 Daniel Colascione <dancol@dancol.org>
* emacs-lisp/generator.el: Make globals conform to elisp * emacs-lisp/generator.el: Make globals conform to elisp
......
...@@ -1259,6 +1259,14 @@ This function is called from `c-common-init', once per mode initialization." ...@@ -1259,6 +1259,14 @@ This function is called from `c-common-init', once per mode initialization."
(font-lock-mark-block-function (font-lock-mark-block-function
. c-mark-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) (make-local-variable 'font-lock-fontify-region-function)
(setq font-lock-fontify-region-function 'c-font-lock-fontify-region) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment