diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-04-26 00:34:54 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-04-26 00:34:54 -0700 |
| commit | af80458d7e9d2f81a8d13a0b4ad152743c34520c (patch) | |
| tree | e993b235e182a270be564b06e01596f9466c857c /lisp/emacs-lisp | |
| parent | 9fc02c2f823942e302c5bc8938e9a6e4e03003f1 (diff) | |
| parent | e5271cf20c08ba88e5c91a9626c08022f9a5058c (diff) | |
| download | emacs-af80458d7e9d2f81a8d13a0b4ad152743c34520c.tar.gz emacs-af80458d7e9d2f81a8d13a0b4ad152743c34520c.tar.bz2 emacs-af80458d7e9d2f81a8d13a0b4ad152743c34520c.zip | |
Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)))) |