Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org

This commit is contained in:
Glenn Morris 2013-04-26 00:34:54 -07:00
commit af80458d7e
3 changed files with 13 additions and 2 deletions

View file

@ -99,7 +99,7 @@ Put first the functions more likely to cause a change and cheaper to compute.")
(setq beg (or (previous-single-property-change beg 'syntax-multiline)
(point-min))))
;;
(when (get-text-property end 'font-lock-multiline)
(when (get-text-property end 'syntax-multiline)
(setq end (or (text-property-any end (point-max)
'syntax-multiline nil)
(point-max))))