diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 2 |
2 files changed, 7 insertions, 1 deletions
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 <erikcharlebois@gmail.com> + + * 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 <monnier@iro.umontreal.ca> * 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)))) |