[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:46:26

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

Log message:
        Ed Reingold  <reingold at emr.cs.iit.edu>
        
        (calendar-current-date): Add an optional argument giving an offset from 
today.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15784
retrieving revision 1.15785
diff -u -b -r1.15784 -r1.15785
--- ChangeLog   8 Jul 2009 02:37:11 -0000       1.15784
+++ ChangeLog   8 Jul 2009 02:46:23 -0000       1.15785
@@ -1,3 +1,8 @@
+2009-07-08  Ed Reingold  <address@hidden>
+
+       * calendar/calendar.el (calendar-current-date):
+       Add an optional argument giving an offset from today.
+
 2009-07-08  Glenn Morris  <address@hidden>
 
        * tutorial.el (tutorial--describe-nonstandard-key):

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -b -r1.281 -r1.282
--- calendar/calendar.el        2 Mar 2009 07:00:47 -0000       1.281
+++ calendar/calendar.el        8 Jul 2009 02:46:26 -0000       1.282
@@ -1784,10 +1784,14 @@
          (t (set-buffer buffer)
             (bury-buffer))))))
 
-(defun calendar-current-date ()
-  "Return the current date in a list (month day year)."
+(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)))
-    (list (nth 4 now) (nth 3 now) (nth 5 now))))
+    (calendar-gregorian-from-absolute
+     (+ (calendar-absolute-from-gregorian
+         (list (nth 4 now) (nth 3 now) (nth 5 now)))
+        (if offset offset 0)))))
 
 (defun calendar-column-to-segment ()
   "Convert current column to calendar month \"segment\".