aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2009-06-22 06:29:59 +0000
committerGlenn Morris <[email protected]>2009-06-22 06:29:59 +0000
commit731a00fbd7293d006744df495d13da5a27d4daec (patch)
tree2d62b64a9efb66333e8a21bcd24ea9bb7506cd74
parentc66cd0ff658dfcba849176d58a405c69e9672e80 (diff)
(appt-make-list): Fix off-by-one error caused by
differing behavior of \n and ^ in strings. (Bug#3385)
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/calendar/appt.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b8da709b9..c2ff91ba0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2009-06-22 Glenn Morris <[email protected]>
+ * 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 6b58b8ca55..3c39cd9960 100644
--- 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.