[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111344: * lisp/emacs-lisp/syntax.el (syntax-propertize-multiline):

[Stefan Monnier]

------------------------------------------------------------
revno: 111344
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14237
author: Erik Charlebois <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2013-04-22 10:11:37 -0400
message:
  * lisp/emacs-lisp/syntax.el (syntax-propertize-multiline):
  Use `syntax-multiline' text property consistently instead of
  `font-lock-multiline'..
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/syntax.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-06 23:05:53 +0000
+++ b/lisp/ChangeLog    2013-04-22 14:11:37 +0000
@@ -1,3 +1,9 @@
+2013-04-22  Erik Charlebois  <address@hidden>
+
+       * 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  <address@hidden>
 
        * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert

=== modified file 'lisp/emacs-lisp/syntax.el'
--- a/lisp/emacs-lisp/syntax.el 2013-01-01 09:11:05 +0000
+++ b/lisp/emacs-lisp/syntax.el 2013-04-22 14:11:37 +0000
@@ -99,7 +99,7 @@
     (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))))