10 files changed, 20 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87784c092b0..ff1981ac7e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,22 +2,20 @@
 
         * dired-aux.el (dired-overwrite-confirmed): Revert last change.
 
-        * dired.el (dired-dnd-handle-local-file): Obey
-        dired-backup-overwrite.
+        * dired.el (dired-dnd-handle-local-file): Obey dired-backup-overwrite.
 
 2008-04-06  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * viper*.el (viper-search-wrap-around-t): replace with
+        * viper*.el (viper-search-wrap-around-t): Replace with
         viper-search-wrap-around.
 
-        * ediff*.el: replace 3-argument 'require' statements with 1-argument
-        ones (wrapped in if's). For compatibility with the current stable
+        * ediff*.el: Replace 3-argument 'require' statements with 1-argument
+        ones (wrapped in if's).  For compatibility with the current stable
         version of XEmacs.
 
 2008-04-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * vc.el (vc-status-prepare-status-buffer):
-        Reset vc-parent-buffer-name.
+        * vc.el (vc-status-prepare-status-buffer): Reset vc-parent-buffer-name.
 
 2008-04-06  Jason Rumney  <jasonr@gnu.org>
 
@@ -229,7 +227,7 @@
         (calendar-chinese-goto-date): Rename calendar-goto-chinese-date.
         Keep old name as alias, update callers.
 
-        * cal-hebrew.el (calendar-hebrew-leap-year-p):
+        * calendar/cal-hebrew.el (calendar-hebrew-leap-year-p):
         Rename hebrew-calendar-leap-year-p.  Update callers.
         (calendar-hebrew-last-month-of-year):
         Rename hebrew-calendar-last-month-of-year.  Update callers.
@@ -314,7 +312,7 @@
 
         * calendar/cal-menu.el, calendar/calendar.el:
         Update for chinese and hebrew name changes.
-        * diary-lib.el: Update for hebrew name changes.
+        * calendar/diary-lib.el: Update for hebrew name changes.
 
 2008-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index cf9dab4af8d..bc51154dabf 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -601,7 +601,7 @@ Echo Chinese date unless NOECHO is non-nil."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-chinese-date ()
   "Chinese calendar equivalent of date diary entry."
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 217e861dc78..7ca17c23861 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -183,7 +183,7 @@ Echo Coptic date unless NOECHO is t."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-coptic-date ()
   "Coptic calendar equivalent of date diary entry."
@@ -259,7 +259,7 @@ Echo Ethiopic date unless NOECHO is t."
 (define-obsolete-function-alias 'calendar-goto-ethiopic-date
   'calendar-ethiopic-goto-date "23.1")
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-ethiopic-date ()
   "Ethiopic calendar equivalent of date diary entry."
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 8e895c9628a..2c6ebe546bd 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -255,7 +255,7 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-french-date ()
   "French calendar equivalent of date diary entry."
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 32685337bed..15c39837680 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -147,7 +147,7 @@ Interactively, goes to the first day of the specified week."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-iso-date ()
   "ISO calendar equivalent of date diary entry."
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index af66c31e4c2..5f24527b1ee 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -204,13 +204,13 @@ Echo astronomical (Julian) day number unless NOECHO is non-nil."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-julian-date ()
   "Julian calendar equivalent of date diary entry."
   (format "Julian date: %s" (calendar-julian-date-string date)))
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-astro-day-number ()
   "Astronomical (Julian) day number diary entry."
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 0dd78edebfa..662a54a2bb9 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -383,7 +383,7 @@ Echo Mayan date unless NOECHO is non-nil."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-mayan-date ()
   "Show the Mayan long count, haab, and tzolkin dates as a diary entry."
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 0b7ffe117ad..969821cb834 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -211,7 +211,7 @@ Echo Persian date unless NOECHO is non-nil."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-persian-date ()
   "Persian calendar equivalent of date diary entry."
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 549bf689c29..63fa7212766 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -211,6 +211,7 @@ remainder mod 4 gives the phase: 0 new moon, 1 first quarter, 2 full moon,
         (lunar-phase-list m1 y1) "\n")))
     (message "Computing phases of the moon...done")))
 
+;; FIXME ?
 ;;;###autoload
 (defun phases-of-moon (&optional arg)
   "Display the quarters of the moon for last month, this month, and next month.
@@ -226,7 +227,7 @@ This function is suitable for execution in a .emacs file."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 
 ;;;###diary-autoload
 (defun diary-phases-of-moon (&optional mark)
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 3d10b21a291..19bad4c22f9 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -781,6 +781,7 @@ and `calendar-time-zone' are used to interpret local time."
               end-long long)))
     (/ (+ start end) 2.0)))
 
+;; FIXME but there already is solar-sunrise-sunset.
 ;;;###autoload
 (defun sunrise-sunset (&optional arg)
   "Local time of sunrise and sunset for today.  Accurate to a few seconds.
@@ -867,7 +868,7 @@ Accurate to a few seconds."
 
 (defvar date)
 
-;; To be called from list-sexp-diary-entries, where DATE is bound.
+;; To be called from diary-list-sexp-entries, where DATE is bound.
 ;;;###diary-autoload
 (defun diary-sunrise-sunset ()
   "Local time of sunrise and sunset as a diary entry.