aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-02-07 20:51:18 +0000
committerRichard M. Stallman1994-02-07 20:51:18 +0000
commit25ed02fd9e016f4a2973138e726bc82834e4fb7d (patch)
tree0f9df67a2582f8dbecc53f12674c291de5d9fce2
parent56e7830d68e9908a0155d74b0283c8ba61533af5 (diff)
downloademacs-25ed02fd9e016f4a2973138e726bc82834e4fb7d.tar.gz
emacs-25ed02fd9e016f4a2973138e726bc82834e4fb7d.zip
(view-diary-entries,diary-islamic-date): Use new error arg
to calendar-cursor-to-date.
-rw-r--r--lisp/diary-lib.el10
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 @@
1;;; diary.el --- diary functions. 1;;; diary.el --- diary functions.
2 2
3;; Copyright (C) 1989, 1990, 1992 Free Software Foundation, Inc. 3;; Copyright (C) 1989, 1990, 1992, 1993 Free Software Foundation, Inc.
4 4
5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
6;; Keywords: calendar 6;; Keywords: calendar
@@ -67,9 +67,7 @@ in the displayed three-month calendar."
67 (let ((d-file (substitute-in-file-name diary-file))) 67 (let ((d-file (substitute-in-file-name diary-file)))
68 (if (and d-file (file-exists-p d-file)) 68 (if (and d-file (file-exists-p d-file))
69 (if (file-readable-p d-file) 69 (if (file-readable-p d-file)
70 (list-diary-entries (or (calendar-cursor-to-date) 70 (list-diary-entries (calendar-cursor-to-date t) arg)
71 (error "Cursor is not on a date!"))
72 arg)
73 (error "Your diary file is not readable!")) 71 (error "Your diary file is not readable!"))
74 (error "You don't have a diary file!")))) 72 (error "You don't have a diary file!"))))
75 73
@@ -1339,9 +1337,7 @@ ending of that number (that is, `st', `nd', `rd' or `th', as appropriate."
1339 1337
1340(defun diary-islamic-date () 1338(defun diary-islamic-date ()
1341 "Islamic calendar equivalent of date diary entry." 1339 "Islamic calendar equivalent of date diary entry."
1342 (let ((i (calendar-islamic-date-string 1340 (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t))))
1343 (or (calendar-cursor-to-date)
1344 (error "Cursor is not on a date!")))))
1345 (if (string-equal i "") 1341 (if (string-equal i "")
1346 "Date is pre-Islamic" 1342 "Date is pre-Islamic"
1347 (format "Islamic date (until sunset): %s" i)))) 1343 (format "Islamic date (until sunset): %s" i))))