summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Berman <stephen.berman@gmx.net>2010-12-08 17:50:08 -0800
committerGlenn Morris <rgm@gnu.org>2010-12-08 17:50:08 -0800
commit81ced43d179308153dfba3eece877e84c4091dea (patch)
tree1be28de271959748e70cbc92999429a9f9508a4a
parentb2364eaaa8387b54f0c43beda3d0ea23b8fa3b89 (diff)
downloademacs-81ced43d179308153dfba3eece877e84c4091dea.tar.gz
diary-lib fix for bug#7536.
* lisp/calendar/diary-lib.el (diary-list-sexp-entries): Handle case of no newline at end of file.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/diary-lib.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b81098fb9e..d8edf108bd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-09 Stephen Berman <stephen.berman@gmx.net>
+
+ * calendar/diary-lib.el (diary-list-sexp-entries):
+ Handle case of no newline at end of file. (Bug#7536)
+
2010-12-09 Glenn Morris <rgm@gnu.org>
* mail/smtpmail.el (smtpmail-send-it): Revert previous change.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 219e489a2eb..899c142b75b 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1744,7 +1744,7 @@ best if they are non-marking."
(forward-line 1)
(while (looking-at "[ \t]")
(forward-line 1))
- (backward-char 1)
+ (if (bolp) (backward-char 1))
(setq entry (buffer-substring-no-properties entry-start (point))))
(setq diary-entry (diary-sexp-entry sexp entry date)
literal entry ; before evaluation