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

*** empty log message ***

Browse source
This commit is contained in:
Glenn Morris 2004-02-23 00:11:12 +00:00
parent de3fce917a
commit 4c635ea353
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,3 +1,15 @@
2004-02-23 Glenn Morris <gmorris@ast.cam.ac.uk>
* calendar/calendar.el (generate-calendar)
(calendar-read-date): Prevent display of BC calendars once more -
reverts 2003-10-01 change.
(generate-calendar-month): Doc fix.
2004-02-03 Matthew Mundell <matt@mundell.ukfsn.org> (tiny change)
* calendar/diary-lib.el (fancy-diary-display): Don't rely on
return value of increment-calendar-month.
2004-02-21 Stephen Compall <s11@member.fsf.org>
* saveplace.el (save-place-forget-unreadable-files)

21
lisp/calendar/calendar.el
View file

@ -1924,12 +1924,15 @@ Or, for optional MON, YR."
(run-hooks 'today-invisible-calendar-hook)))))
(defun generate-calendar (month year)
"Generate a three-month Gregorian calendar centered around MONTH, YEAR.
A negative YEAR is interpreted as BC; -1 being 1 BC, and so on.
Note that while calendars can be displayed for years BC, some functions (eg
motion, complex holiday functions) will not work correctly for such dates."
(setq displayed-month month)
(setq displayed-year year)
"Generate a three-month Gregorian calendar centered around MONTH, YEAR."
;;; A negative YEAR is interpreted as BC; -1 being 1 BC, and so on.
;;; Note that while calendars for years BC could be displayed as it
;;; stands, almost all other calendar functions (eg holidays) would
;;; at best have unpredictable results for such dates.
(if (< (+ month (* 12 (1- year))) 2)
(error "Months before February, 1 AD are not available"))
(setq displayed-month month
displayed-year year)
(erase-buffer)
(increment-calendar-month month year -1)
(calendar-for-loop i from 0 to 2 do
@ -1941,7 +1944,7 @@ motion, complex holiday functions) will not work correctly for such dates."
The calendar is inserted at the top of the buffer in which point is currently
located, but indented INDENT spaces. The indentation is done from the first
character on the line and does not disturb the first INDENT characters on the
line. A negative YEAR is interpreted as BC; -1 being 1 BC, and so on."
line."
(let* ((blank-days;; at start of month
(mod
(- (calendar-day-of-week (list month 1 year))
@ -2538,8 +2541,8 @@ If optional NODAY is t, does not ask for day, but just returns
\(month nil year); if NODAY is any other non-nil value the value returned is
\(month year)"
(let* ((year (calendar-read
"Year: "
(lambda (x) (not (zerop x)))
"Year (>0): "
(lambda (x) (> x 0))
(int-to-string (extract-calendar-year
(calendar-current-date)))))
(month-array calendar-month-name-array)