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 @@
+2006-02-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * calendar/calendar.el (calendar-increment-month): Typo in last change.
+
 2006-02-06  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs.
@@ -5,7 +9,7 @@
 2006-02-06  Lars Hansen  <larsh@soem.dk>
 
         * generic-x.el (etc-fstab-generic-mode): Add file system types
-        cifs and usbdevfs. Allow special chars in file names.
+        cifs and usbdevfs.  Allow special chars in file names.
 
 2006-02-05  Jay Belanger  <belanger@truman.edu>
 
@@ -46,13 +50,12 @@
         * textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be
         greedy to find the closing bracket in \*[...] and similar
         expressions.  This is a first rough fix -- many additional
-        refinements are necessary to make nroff mode really usable with
-        groff.
+        refinements are necessary to make nroff mode really usable with groff.
 
 2006-02-03  Jens Petersen  <petersen@redhat.com>  (tiny change)
 
-        * international/mule-cmds.el (set-locale-environment): Add
-        "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
+        * international/mule-cmds.el (set-locale-environment):
+        Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
         libX11.
 
 2006-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."
 The return value is a pair (MONTH . YEAR).
 MON defaults to `displayed-month'.  YR defaults to `displayed-year'."
   (unless mon (setq mon displayed-month))
-  (unless yr (setq mon displayed-year))
+  (unless yr (setq yr displayed-year))
   (increment-calendar-month mon yr n)
   (cons mon yr))