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