瀏覽代碼

Fix bug with diary-display-date-form

Carsten Dominik 15 年之前
父節點
當前提交
1d6570928a
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 3 0
      lisp/ChangeLog
  2. 1 0
      lisp/org-agenda.el

+ 3 - 0
lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-11-09  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
+	Require diary-lib for (diary-date-display-form).
+
 	* org.el (org-log-reschedule, org-log-redeadline): New options.
 	(org-log-note-headings): Add templates for rescheduling and
 	deadline changing.

+ 1 - 0
lisp/org-agenda.el

@@ -6702,6 +6702,7 @@ the resulting entry will not be shown.  When TEXT is empty, switch to
       (org-back-over-empty-lines)
       (backward-char 1)
       (insert "\n")
+      (require 'diary-lib)
       (let ((calendar-date-display-form (diary-date-display-form)))
 	(insert (format "%%%%(diary-anniversary %s) %s"
 			(calendar-date-string d1 nil t) text))))