[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 5ec9d8f: * lisp/calendar/cal-html.el: Require dia
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 5ec9d8f: * lisp/calendar/cal-html.el: Require diary-lib. |
Date: |
Tue, 08 Dec 2015 02:05:45 +0000 |
branch: emacs-25
commit 5ec9d8ff4fdc2769d674ebe1f63c019cc6137273
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/calendar/cal-html.el: Require diary-lib.
(cal-html-list-diary-entries): Handle no diary. (Bug#21994)
---
lisp/calendar/cal-html.el | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 4bddc38..8c46e3a 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -32,6 +32,7 @@
;;; Code:
(require 'calendar)
+(require 'diary-lib)
(defgroup calendar-html nil
@@ -358,12 +359,12 @@ of holidays, rather than diary entries."
;; Monthly calendar
;;------------------------------------------------------------
-(autoload 'diary-list-entries "diary-lib")
-
(defun cal-html-list-diary-entries (d1 d2)
"Generate a list of all diary-entries from absolute date D1 to D2."
- (diary-list-entries (calendar-gregorian-from-absolute d1)
- (1+ (- d2 d1)) t))
+ (if (with-demoted-errors "Not adding diary entries: %S"
+ (diary-check-diary-file))
+ (diary-list-entries (calendar-gregorian-from-absolute d1)
+ (1+ (- d2 d1)) t)))
(defun cal-html-insert-agenda-days (month year diary-list holiday-list)
"Insert HTML commands for a range of days in monthly calendars.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 5ec9d8f: * lisp/calendar/cal-html.el: Require diary-lib.,
Glenn Morris <=