(include-other-diary-files, diary-mail-entries): Refer to

diary-view-entries, diary-list-entries, diary-show-all-entries rather
than obsolete aliases.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 6ced08bf0836bd912fdc058d36cda864d58ab5a3..c27939b8075a9bf4e32695111ebf1b5dcc27d1f4 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -517,7 +517,7 @@ changing the variable `diary-include-string'."
               (unwind-protect
                   (setq diary-entries-list
                         (append diary-entries-list
-                                (list-diary-entries original-date number)))
+                                (diary-list-entries original-date number)))
                 (with-current-buffer (find-buffer-visiting diary-file)
                   (diary-unhide-everything)))
             (beep)
@@ -820,7 +820,7 @@ to run it every morning at 1am."
   (if (string-equal diary-mail-addr "")
       (error "You must set `diary-mail-addr' to use this command")
     (let ((diary-display-hook 'fancy-diary-display))
-      (list-diary-entries (calendar-current-date) (or ndays diary-mail-days)))
+      (diary-list-entries (calendar-current-date) (or ndays diary-mail-days)))
     (compose-mail diary-mail-addr
                   (concat "Diary entries generated "
                           (calendar-date-string (calendar-current-date))))