diff options
| author | Glenn Morris | 2008-08-10 20:05:45 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-08-10 20:05:45 +0000 |
| commit | bf9b4e4e7f6697c3ce3f4d7fd88982e609879a25 (patch) | |
| tree | ef3f58bb336b2e0d0c2cd1cf95f1d70b6c1569ee | |
| parent | 4f44bf18d385406fa5468482e9a5aa22f5871677 (diff) | |
| download | emacs-bf9b4e4e7f6697c3ce3f4d7fd88982e609879a25.tar.gz emacs-bf9b4e4e7f6697c3ce3f4d7fd88982e609879a25.zip | |
(holiday-julian): Fix a problem with holidays in the last fortnight in
Julian October (sync from trunk 2008-03-31).
| -rw-r--r-- | lisp/calendar/cal-julian.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el index ef7ad67272b..273958f4e02 100644 --- a/lisp/calendar/cal-julian.el +++ b/lisp/calendar/cal-julian.el | |||
| @@ -153,7 +153,7 @@ nil if it is not visible in the current calendar window." | |||
| 153 | (julian-end (calendar-julian-from-absolute end-date)) | 153 | (julian-end (calendar-julian-from-absolute end-date)) |
| 154 | (julian-y1 (extract-calendar-year julian-start)) | 154 | (julian-y1 (extract-calendar-year julian-start)) |
| 155 | (julian-y2 (extract-calendar-year julian-end))) | 155 | (julian-y2 (extract-calendar-year julian-end))) |
| 156 | (setq year (if (< 10 month) julian-y1 julian-y2)) | 156 | (setq year (if (<= 10 month) julian-y1 julian-y2)) |
| 157 | (let ((date (calendar-gregorian-from-absolute | 157 | (let ((date (calendar-gregorian-from-absolute |
| 158 | (calendar-absolute-from-julian | 158 | (calendar-absolute-from-julian |
| 159 | (list month day year))))) | 159 | (list month day year))))) |