* lisp/emacs-lisp/syntax.el (syntax-ppss): More sanity check to catch

border case in change-log-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc024b9d3135bf02f57d9cc2da67566218055a59..020f3237e3360be0c2f42749a54a96c418d444e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/syntax.el (syntax-ppss): More sanity check to catch
+       border case in change-log-mode.
+
 2010-09-04  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist):

diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 5cc89596ef53c0c8c5bf8fd5d2361c21bec3c2f7..1ac6e266f0f5247bedd7f08f2e4c8a8958d4445e 100644 (file)
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -209,7 +209,8 @@ Point is at POS when this function returns."
                                (funcall syntax-begin-function)
                                ;; Make sure it's better.
                                (> (point) pt-best))
-                        ;; Simple sanity check.
+                        ;; Simple sanity checks.
+                         (< (point) pos) ; backward-paragraph can fail here.
                         (not (memq (get-text-property (point) 'face)
                                    '(font-lock-string-face font-lock-doc-face
                                      font-lock-comment-face))))