From 269a43cef6057ca0e5d206c8bf9aab418e2493ec Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 7 Mar 2008 12:54:30 +0000 Subject: [PATCH 1/3] Applied Glenn Morris patch. (org-agenda-sunrise-sunset): Require solar. (calendar-longitude, calendar-latitude, calendar-location-name): Declare for compiler. Ref in the emacs-diffs mailing list: --- ChangeLog | 8 +++++++- org.el | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0ca905fb2..b291324fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-07 Glenn Morris + + (org-agenda-sunrise-sunset): Require solar. + (calendar-longitude, calendar-latitude, calendar-location-name): + Declare for compiler. + 2008-03-07 Bastien Guerry * org-export-latex.el (org-export-as-latex): Revert the change @@ -41,7 +47,7 @@ 2008-03-05 Carsten Dominik - * org.el "htmlize"): Removed hack to fix face problem with + * org.el "htmlize": Removed hack to fix face problem with htmlize, it no longer seem necessary. 2008-03-05 Bastien Guerry diff --git a/org.el b/org.el index d01586c38..4498a1715 100644 --- a/org.el +++ b/org.el @@ -23648,12 +23648,17 @@ the cursor position." (interactive) (org-agenda-execute-calendar-command 'list-calendar-holidays)) +(defvar calendar-longitude) +(defvar calendar-latitude) +(defvar calendar-location-name) + (defun org-agenda-sunrise-sunset (arg) "Display sunrise and sunset for the cursor date. Latitude and longitude can be specified with the variables `calendar-latitude' and `calendar-longitude'. When called with prefix argument, latitude and longitude will be prompted for." (interactive "P") + (require 'solar) (let ((calendar-longitude (if arg nil calendar-longitude)) (calendar-latitude (if arg nil calendar-latitude)) (calendar-location-name From eecb21506c123fff2e9674afb1dc8cc4afcf59c8 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 7 Mar 2008 18:05:52 +0000 Subject: [PATCH 2/3] Removed a typo in `org-agenda-export-html-style'. --- org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.el b/org.el index 4498a1715..cda8975d1 100644 --- a/org.el +++ b/org.el @@ -2377,7 +2377,7 @@ the fonts used by the agenda, here is an example: font-weight: 600; } .org-todo { - color: #cc6666;Week-agenda: + color: #cc6666; font-weight: bold; } .org-done { From 135d2ba17a6f7f46617af28e09312499dda5f0e6 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 8 Mar 2008 09:31:47 +0000 Subject: [PATCH 3/3] 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: --- ChangeLog | 5 +++++ org.el | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index b291324fb..969e72136 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-08 Glenn Morris + + (list-diary-entries-hook): Declare for compiler. + (org-get-entries-from-diary): Require diary-lib. + 2008-03-07 Glenn Morris (org-agenda-sunrise-sunset): Require solar. diff --git a/org.el b/org.el index cda8975d1..a942741fd 100644 --- a/org.el +++ b/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)