From: Erik Charlebois Date: Mon, 22 Apr 2013 14:11:37 +0000 (-0400) Subject: * lisp/emacs-lisp/syntax.el (syntax-propertize-multiline): X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~24 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70203c2ec17efdb68b0873e4a62e2862a347e095;p=emacs.git * lisp/emacs-lisp/syntax.el (syntax-propertize-multiline): Use `syntax-multiline' text property consistently instead of `font-lock-multiline'.. Fixes: debbugs:14237 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd209f75bf6..b1baa9d9e64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-04-22 Erik Charlebois + + * emacs-lisp/syntax.el (syntax-propertize-multiline): + Use `syntax-multiline' text property consistently instead of + `font-lock-multiline'. (bug#14237). + 2013-04-06 Stefan Monnier * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index bf2c8308bb5..0a4758a9ccd 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -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))))