[Emacs-diffs] Changes to emacs/lisp/calendar/cal-html.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/07 01:59:37

Index: cal-html.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-html.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cal-html.el 15 Mar 2008 02:57:42 -0000      1.8
+++ cal-html.el 7 Apr 2008 01:59:36 -0000       1.9
@@ -207,15 +207,15 @@
   (insert (cal-html-b-table "class=header"))
   (insert cal-html-b-tablerow-string)
   (insert cal-html-b-tabledata-string)          ; month links
-  (increment-calendar-month month year -1)      ; previous month
+  (calendar-increment-month month year -1)      ; previous month
   (cal-html-insert-link-monthpage month year t) ; t --> change-dir
-  (increment-calendar-month month year 1)       ; current month
+  (calendar-increment-month month year 1)       ; current month
   (cal-html-insert-link-yearpage month year)
-  (increment-calendar-month month year 1)       ; next month
+  (calendar-increment-month month year 1)       ; next month
   (cal-html-insert-link-monthpage month year t) ; t --> change-dir
   (insert cal-html-e-tabledata-string)
   (insert cal-html-b-tabledata-string)  ; minical
-  (increment-calendar-month month year -1)
+  (calendar-increment-month month year -1)
   (cal-html-insert-minical month year)
   (insert cal-html-e-tabledata-string)
   (insert cal-html-e-tablerow-string)   ; end
@@ -418,8 +418,8 @@
 MONTH and YEAR are taken from the calendar cursor position.  Note
 that any existing output files are overwritten."
   (interactive (let* ((date (calendar-cursor-to-date t))
-                      (month (extract-calendar-month date))
-                      (year (extract-calendar-year date)))
+                      (month (calendar-extract-month date))
+                      (year (calendar-extract-year date)))
                  (list month year (cal-html-year-dir-ask-user year))))
   (make-directory dir t)
   (cal-html-one-month month year dir))
@@ -430,7 +430,7 @@
 The output directory DIR is created if necessary.  Interactively,
 YEAR is taken from the calendar cursor position.  Note that any
 existing output files are overwritten."
-  (interactive (let ((year (extract-calendar-year
+  (interactive (let ((year (calendar-extract-year
                             (calendar-cursor-to-date t))))
                  (list year (cal-html-year-dir-ask-user year))))
   (make-directory dir t)