procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2009-07-08 02:48:11 +00:00
parent 3ce82f979d
commit 7ef5b8b271
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2009-07-08 Glenn Morris <rgm@gnu.org>
* calendar/calendar.el (calendar-current-date): Rework previous change.
2009-07-08 Ed Reingold <reingold@emr.cs.iit.edu>
* calendar/calendar.el (calendar-current-date):

13
lisp/calendar/calendar.el
View file

@ -1786,12 +1786,13 @@ the STRINGS are just concatenated and the result truncated."
(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)))
(calendar-gregorian-from-absolute
(+ (calendar-absolute-from-gregorian
(list (nth 4 now) (nth 3 now) (nth 5 now)))
(if offset offset 0)))))
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
(+ offset (calendar-absolute-from-gregorian now))))))
(defun calendar-column-to-segment ()
"Convert current column to calendar month \"segment\".