Mercurial > emacs
comparison lisp/calendar/calendar.el @ 90294:c5406394f567
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 08 Feb 2006 04:26:44 +0000 |
| parents | 5b7d410e31f9 3d624f4184ec |
| children | 5754737d1e04 |
comparison
equal
deleted
inserted
replaced
| 90293:275e0a144c1d | 90294:c5406394f567 |
|---|---|
| 1306 (defun calendar-increment-month (n &optional mon yr) | 1306 (defun calendar-increment-month (n &optional mon yr) |
| 1307 "Return the Nth month after MON/YR. | 1307 "Return the Nth month after MON/YR. |
| 1308 The return value is a pair (MONTH . YEAR). | 1308 The return value is a pair (MONTH . YEAR). |
| 1309 MON defaults to `displayed-month'. YR defaults to `displayed-year'." | 1309 MON defaults to `displayed-month'. YR defaults to `displayed-year'." |
| 1310 (unless mon (setq mon displayed-month)) | 1310 (unless mon (setq mon displayed-month)) |
| 1311 (unless yr (setq mon displayed-year)) | 1311 (unless yr (setq yr displayed-year)) |
| 1312 (increment-calendar-month mon yr n) | 1312 (increment-calendar-month mon yr n) |
| 1313 (cons mon yr)) | 1313 (cons mon yr)) |
| 1314 | 1314 |
| 1315 (defmacro calendar-for-loop (var from init to final do &rest body) | 1315 (defmacro calendar-for-loop (var from init to final do &rest body) |
| 1316 "Execute a for loop." | 1316 "Execute a for loop." |