(mark-sexp-diary-entries): Fix previous chg.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 65f34c6447494d8ea8443a556c2893477cd4bd3c..2f0dfd7cfc2fc713b0bfc7f04d59b0ac10bdd0dd 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -840,11 +840,14 @@ is marked.  See the documentation for the function `list-sexp-diary-entries'."
               (backward-char 1)
               (setq entry ""))
           (setq entry-start (point))
+          ;; Find end of entry
           (re-search-forward "\^M\\|\n" nil t)
           (while (looking-at " \\|\^I")
            (or (re-search-forward "\^M\\|\n" nil t)
                (re-search-forward "$" nil t)))
-          (backward-char 1)
+          (if (or (char-equal (preceding-char) ?\^M)
+                 (char-equal (preceding-char) ?\n))
+             (backward-char 1))
           (setq entry (buffer-substring-no-properties entry-start (point)))
           (while (string-match "[\^M]" entry)
             (aset entry (match-beginning 0) ?\n )))