Use the new file names in autoloads.

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 5ab508d57b3174ca41c2ade57f5e5a0c722af333..58cf6c145a81a355af43a459538835cd95d5ceed 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -51,11 +51,11 @@
 ;; The following files are part of the calendar/diary code:
 
 ;;       appt.el                       Appointment notification
-;;       cal-chinese.el                Chinese calendar
+;;       cal-china.el                  Chinese calendar
 ;;       cal-coptic.el                 Coptic/Ethiopic calendars
 ;;       cal-dst.el                    Daylight savings time rules
 ;;       cal-hebrew.el                 Hebrew calendar
-;;       cal-islamic.el                Islamic calendar
+;;       cal-islam.el                  Islamic calendar
 ;;       cal-iso.el                    ISO calendar
 ;;       cal-julian.el                 Julian/astronomical calendars
 ;;       cal-mayan.el                  Mayan calendars
@@ -1295,15 +1295,15 @@ calendar."
   "Move cursor to previous instance of Mayan Haab/Tzolkin combination."
   t)
 
-(autoload 'calendar-goto-chinese-date "cal-chinese"
+(autoload 'calendar-goto-chinese-date "cal-china"
    "Move cursor to Chinese date."
    t)
 
-(autoload 'calendar-print-chinese-date "cal-chinese"
+(autoload 'calendar-print-chinese-date "cal-china"
  "Show the Chinese date equivalents of date."
  t)
 
-(autoload 'calendar-chinese-date-string "cal-chinese"
+(autoload 'calendar-chinese-date-string "cal-china"
   "String of Chinese date of Gregorian date."
   t)
 
@@ -1349,11 +1349,11 @@ Driven by the variable `calendar-date-display-form'."
   "String of ISO date of Gregorian date."
   t)
 
-(autoload 'calendar-print-islamic-date "cal-islamic"
+(autoload 'calendar-print-islamic-date "cal-islam"
   "Show the Islamic date equivalents of date."
   t)
 
-(autoload 'calendar-islamic-date-string "cal-islamic"
+(autoload 'calendar-islamic-date-string "cal-islam"
   "String of Islamic date of Gregorian date."
   t)
 
@@ -1453,17 +1453,17 @@ to the date indicated by point."
 to the date indicated by point."
   t)
 
-(autoload 'insert-islamic-diary-entry "cal-islamic"
+(autoload 'insert-islamic-diary-entry "cal-islam"
   "Insert a diary entry for the Islamic date corresponding to the date
 indicated by point."
   t)
 
-(autoload 'insert-monthly-islamic-diary-entry "cal-islamic"
+(autoload 'insert-monthly-islamic-diary-entry "cal-islam"
   "Insert a monthly diary entry for the day of the Islamic month corresponding
 to the date indicated by point."
   t)
 
-(autoload 'insert-yearly-islamic-diary-entry "cal-islamic"
+(autoload 'insert-yearly-islamic-diary-entry "cal-islam"
   "Insert an annual diary entry for the day of the Islamic year corresponding
 to the date indicated by point."
   t)

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index b9bb60c049ef54dbb84975a063e8cec1123d67e6..b83a24494d9bfd41fdc31871e243b1883e359862 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -116,23 +116,23 @@ The holidays are those in the list `calendar-holidays'."
   "Astronomical (Julian) day number diary entry."
   t)
 
-(autoload 'diary-chinese-date "cal-chinese"
+(autoload 'diary-chinese-date "cal-china"
   "Chinese calendar equivalent of date diary entry."
   t)
 
-(autoload 'diary-islamic-date "cal-islamic"
+(autoload 'diary-islamic-date "cal-islam"
   "Islamic calendar equivalent of date diary entry."
   t)
 
-(autoload 'list-islamic-diary-entries "cal-islamic"
+(autoload 'list-islamic-diary-entries "cal-islam"
   "Add any Islamic date entries from the diary file to `diary-entries-list'."
   t)
 
-(autoload 'mark-islamic-diary-entries "cal-islamic"
+(autoload 'mark-islamic-diary-entries "cal-islam"
   "Mark days in the calendar window that have Islamic date diary entries."
   t)
 
-(autoload 'mark-islamic-calendar-date-pattern "cal-islamic"
+(autoload 'mark-islamic-calendar-date-pattern "cal-islam"
    "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR."
   t)
 

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 70fe3e5a50ec6857403ee5702adbebed48995d7b..cb5b3a1d8cb325123856a527dac7aff572de2c0e 100644 (file)
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -73,11 +73,11 @@
   "List of dates around Tisha B'Av, as visible in calendar window."
   t)
 
-(autoload 'holiday-islamic "cal-islamic"
+(autoload 'holiday-islamic "cal-islam"
   "Holiday on MONTH, DAY (Islamic) called STRING."
   t)
 
-(autoload 'holiday-chinese-new-year "cal-chinese"
+(autoload 'holiday-chinese-new-year "cal-china"
   "Date of Chinese New Year."
   t)