瀏覽代碼

Applied Glenn Morris patch.

(list-diary-entries-hook): Declare for compiler.
(org-get-entries-from-diary): Require diary-lib.

Ref in the emacs-diffs mailing list:
<E1JXpsE-0008A3-19@cvs.savannah.gnu.org>
Bastien Guerry 17 年之前
父節點
當前提交
135d2ba17a
共有 2 個文件被更改,包括 7 次插入0 次删除
  1. 5 0
      ChangeLog
  2. 2 0
      org.el

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-03-08  Glenn Morris  <rmg@gnu.org>
+
+	(list-diary-entries-hook): Declare for compiler.
+	(org-get-entries-from-diary): Require diary-lib.
+
 2008-03-07  Glenn Morris  <rmg@gnu.org>
 
 	(org-agenda-sunrise-sunset): Require solar.

+ 2 - 0
org.el

@@ -21531,9 +21531,11 @@ MATCH is being ignored."
 ;;; Diary integration
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
+(defvar list-diary-entries-hook)
 
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
+  (require 'diary-lib)
   (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
 	 (diary-display-hook '(fancy-diary-display))
 	 (pop-up-frames nil)