summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-09-05 00:51:39 +0200
committerStefan Monnier <monnier@iro.umontreal.ca>2010-09-05 00:51:39 +0200
commit2e664aab0b16b0470484b53eb09d122959a0b0e7 (patch)
treecc66f3f1ae26a2c6c406233f9c17b062b468cdf8 /lisp
parent13ef65a483dd7d17ff5dce4a5ea377ba6bd678ca (diff)
downloademacs-2e664aab0b16b0470484b53eb09d122959a0b0e7.tar.gz
emacs-2e664aab0b16b0470484b53eb09d122959a0b0e7.tar.bz2
emacs-2e664aab0b16b0470484b53eb09d122959a0b0e7.zip
* lisp/emacs-lisp/syntax.el (syntax-ppss): More sanity check to catch
border case in change-log-mode.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/syntax.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc024b9d313..020f3237e33 100644
--- 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 5cc89596ef5..1ac6e266f0f 100644
--- 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))))