diff options
author | Richard M. Stallman <rms@gnu.org> | 1994-02-07 20:51:18 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1994-02-07 20:51:18 +0000 |
commit | f13bf28af87ca0367e159fc7e3a21f8afd432ba7 (patch) | |
tree | 6f71ecb2b5a3cddeb798bb8c9ec906f44daf5838 /lisp/=diary-lib.el | |
parent | a7a2222fa36f3ab1c65e0546f1a02e8c162d86b2 (diff) | |
download | emacs-f13bf28af87ca0367e159fc7e3a21f8afd432ba7.tar.gz |
(view-diary-entries,diary-islamic-date): Use new error arg
to calendar-cursor-to-date.
Diffstat (limited to 'lisp/=diary-lib.el')
-rw-r--r-- | lisp/=diary-lib.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/=diary-lib.el b/lisp/=diary-lib.el index 2ca7ed9cc26..9b9d2a935fc 100644 --- a/lisp/=diary-lib.el +++ b/lisp/=diary-lib.el @@ -1,6 +1,6 @@ ;;; diary.el --- diary functions. -;; Copyright (C) 1989, 1990, 1992 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1990, 1992, 1993 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Keywords: calendar @@ -67,9 +67,7 @@ in the displayed three-month calendar." (let ((d-file (substitute-in-file-name diary-file))) (if (and d-file (file-exists-p d-file)) (if (file-readable-p d-file) - (list-diary-entries (or (calendar-cursor-to-date) - (error "Cursor is not on a date!")) - arg) + (list-diary-entries (calendar-cursor-to-date t) arg) (error "Your diary file is not readable!")) (error "You don't have a diary file!")))) @@ -1339,9 +1337,7 @@ ending of that number (that is, `st', `nd', `rd' or `th', as appropriate." (defun diary-islamic-date () "Islamic calendar equivalent of date diary entry." - (let ((i (calendar-islamic-date-string - (or (calendar-cursor-to-date) - (error "Cursor is not on a date!"))))) + (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t)))) (if (string-equal i "") "Date is pre-Islamic" (format "Islamic date (until sunset): %s" i)))) |