* 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 dd209f75bf6846b0fda203feeec8ccb7fa4525f6..b1baa9d9e640f660ddbc0eb072d9a81abfe52094 100644 (file)
--- 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 bf2c8308bb5fd569ee7ffeae8a84a00fc056c0f0..0a4758a9ccdbb20d9e70e1d818a084840a3eff9c 100644 (file)
--- 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))))