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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/07/08 02:48:14

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

Log message:
        (calendar-current-date): Rework previous change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15785&r2=1.15786
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.282&r2=1.283

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15785
retrieving revision 1.15786
diff -u -b -r1.15785 -r1.15786
--- ChangeLog   8 Jul 2009 02:46:23 -0000       1.15785
+++ ChangeLog   8 Jul 2009 02:48:11 -0000       1.15786
@@ -1,3 +1,7 @@
+2009-07-08  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (calendar-current-date): Rework previous change.
+
 2009-07-08  Ed Reingold  <address@hidden>
 
        * calendar/calendar.el (calendar-current-date):

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -b -r1.282 -r1.283
--- calendar/calendar.el        8 Jul 2009 02:46:26 -0000       1.282
+++ calendar/calendar.el        8 Jul 2009 02:48:13 -0000       1.283
@@ -1786,12 +1786,13 @@
 
 (defun calendar-current-date (&optional offset)
   "Return the current date in a list (month day year).
-Optional OFFSET is number of days from current date."
-  (let ((now (decode-time)))
+Optional integer OFFSET is a number of days from the current date."
+  (let* ((now (decode-time))
+         (now (list (nth 4 now) (nth 3 now) (nth 5 now))))
+    (if (zerop (or offset 0))
+        now
     (calendar-gregorian-from-absolute
-     (+ (calendar-absolute-from-gregorian
-         (list (nth 4 now) (nth 3 now) (nth 5 now)))
-        (if offset offset 0)))))
+       (+ offset (calendar-absolute-from-gregorian now))))))
 
 (defun calendar-column-to-segment ()
   "Convert current column to calendar month \"segment\".