[Emacs-diffs] emacs/lisp ChangeLog calendar/appt.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/06/22 06:30:03

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : appt.el 

Log message:
        (appt-make-list): Fix off-by-one error caused by
        differing behavior of \n and ^ in strings.  (Bug#3385)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15706&r2=1.15707
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/appt.el?cvsroot=emacs&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15706
retrieving revision 1.15707
diff -u -b -r1.15706 -r1.15707
--- ChangeLog   22 Jun 2009 06:27:00 -0000      1.15706
+++ ChangeLog   22 Jun 2009 06:29:59 -0000      1.15707
@@ -1,5 +1,8 @@
 2009-06-22  Glenn Morris  <address@hidden>
 
+       * 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

Index: calendar/appt.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/appt.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- calendar/appt.el    5 Jan 2009 03:20:31 -0000       1.95
+++ calendar/appt.el    22 Jun 2009 06:30:02 -0000      1.96
@@ -568,7 +568,7 @@
                                  (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.