(appt-make-list): Fix off-by-one error caused by

differing behavior of \n and ^ in strings.  (Bug#3385)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b8da709b9215d808fd6f628b7d5979e08385461..c2ff91ba0be89f0aca5696ed092fc4287c2873ce 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-22  Glenn Morris  <rgm@gnu.org>
 
+       * calendar/appt.el (appt-make-list): Fix off-by-one error caused by
+       differing behavior of \n and ^ in strings.  (Bug#3385)
+
        * emacs-lisp/cl-indent.el: Remove leading "*" from defcustom docs.
 
        * emacs-lisp/lisp-mode.el (lisp-indent-offset): Fix safe-local-variable

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 6b58b8ca552fd3178cf6e4c5db93900a4ffb0a6c..3c39cd9960e5a04745611077dd75dc1617d07cce 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -568,7 +568,7 @@ appointment package (if it is not already active)."
                                  (match-end 0)))
                            ;; Get the whole string for this appointment.
                            (appt-time-string
-                            (substring time-string beg (if end (1- end))))
+                            (substring time-string beg end))
                            (appt-time (list (appt-convert-time only-time)))
                            (time-msg (list appt-time appt-time-string)))
                       ;; Add this appointment to appt-time-msg-list.