summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-09-21 15:09:22 +0200
committerStefan Monnier <monnier@iro.umontreal.ca>2010-09-21 15:09:22 +0200
commitc9805d2356942878e55e92aae5fd1dee756f366b (patch)
tree13e72d71ba9ac053d073b3450f125b32754829c5 /lisp
parent872b1b16c3ffbebe205beb05e8cd42f3b1605c9f (diff)
downloademacs-c9805d2356942878e55e92aae5fd1dee756f366b.tar.gz
* lisp/newcomment.el (comment-normalize-vars): Better test validity of
comment-end-skip.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/newcomment.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a411d7e9c72..e69a658cfa6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-21 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * newcomment.el (comment-normalize-vars): Better test validity of
+ comment-end-skip.
+
2010-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/float-sup.el (float-pi): New name for `pi'.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 5d2da467347..1e40317c9a1 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -318,7 +318,8 @@ the variables are properly set."
"+\\)[ \t]*")))
(unless (and comment-end-skip
;; In case comment-end has changed since last time.
- (string-match comment-end-skip comment-end))
+ (string-match comment-end-skip
+ (if (string= "" comment-end) "\n" comment-end)))
(let ((ce (if (string= "" comment-end) "\n"
(comment-string-strip comment-end t t))))
(set (make-local-variable 'comment-end-skip)