aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2006-02-06 16:56:35 +0000
committerStefan Monnier2006-02-06 16:56:35 +0000
commitb06ee3d249708aa7b0f596e31121c46fdee46579 (patch)
tree19b35b02a3a1d81783a2459a90e40683d9eec32e /lisp
parentcbbd2cd318d1b4ba9803650c2ef8ac2bba00f562 (diff)
downloademacs-b06ee3d249708aa7b0f596e31121c46fdee46579.tar.gz
emacs-b06ee3d249708aa7b0f596e31121c46fdee46579.zip
(calendar-increment-month): Typo in last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/calendar/calendar.el2
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2d92160448..2822e1c1d1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-02-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * calendar/calendar.el (calendar-increment-month): Typo in last change.
4
12006-02-06 Thien-Thi Nguyen <ttn@gnu.org> 52006-02-06 Thien-Thi Nguyen <ttn@gnu.org>
2 6
3 * vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs. 7 * vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs.
@@ -5,7 +9,7 @@
52006-02-06 Lars Hansen <larsh@soem.dk> 92006-02-06 Lars Hansen <larsh@soem.dk>
6 10
7 * generic-x.el (etc-fstab-generic-mode): Add file system types 11 * generic-x.el (etc-fstab-generic-mode): Add file system types
8 cifs and usbdevfs. Allow special chars in file names. 12 cifs and usbdevfs. Allow special chars in file names.
9 13
102006-02-05 Jay Belanger <belanger@truman.edu> 142006-02-05 Jay Belanger <belanger@truman.edu>
11 15
@@ -46,13 +50,12 @@
46 * textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be 50 * textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be
47 greedy to find the closing bracket in \*[...] and similar 51 greedy to find the closing bracket in \*[...] and similar
48 expressions. This is a first rough fix -- many additional 52 expressions. This is a first rough fix -- many additional
49 refinements are necessary to make nroff mode really usable with 53 refinements are necessary to make nroff mode really usable with groff.
50 groff.
51 54
522006-02-03 Jens Petersen <petersen@redhat.com> (tiny change) 552006-02-03 Jens Petersen <petersen@redhat.com> (tiny change)
53 56
54 * international/mule-cmds.el (set-locale-environment): Add 57 * international/mule-cmds.el (set-locale-environment):
55 "/usr/share/X11/locale/locale.alias" to search list for xorg-x11 58 Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
56 libX11. 59 libX11.
57 60
582006-02-03 Joe Wells <jbw@macs.hw.ac.uk> (tiny change) 612006-02-03 Joe Wells <jbw@macs.hw.ac.uk> (tiny change)
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index f01f4305708..b48f63458dc 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1308,7 +1308,7 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on."
1308The return value is a pair (MONTH . YEAR). 1308The return value is a pair (MONTH . YEAR).
1309MON defaults to `displayed-month'. YR defaults to `displayed-year'." 1309MON 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