Browse Source

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:
<E1JXU4a-0005Fu-7f@cvs.savannah.gnu.org>
Bastien Guerry 17 years ago
parent
commit
269a43cef6
2 changed files with 12 additions and 1 deletions
  1. 7 1
      ChangeLog
  2. 5 0
      org.el

+ 7 - 1
ChangeLog

@@ -1,3 +1,9 @@
+2008-03-07  Glenn Morris  <rmg@gnu.org>
+
+	(org-agenda-sunrise-sunset): Require solar.
+	(calendar-longitude, calendar-latitude, calendar-location-name):
+	Declare for compiler.
+
 2008-03-07  Bastien Guerry  <bzg@altern.org>
 2008-03-07  Bastien Guerry  <bzg@altern.org>
 
 
 	* org-export-latex.el (org-export-as-latex): Revert the change
 	* org-export-latex.el (org-export-as-latex): Revert the change
@@ -41,7 +47,7 @@
 
 
 2008-03-05  Carsten Dominik  <dominik@science.uva.nl>
 2008-03-05  Carsten Dominik  <dominik@science.uva.nl>
 
 
-	* 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.
 	htmlize, it no longer seem necessary.
 
 
 2008-03-05  Bastien Guerry  <bzg@altern.org>
 2008-03-05  Bastien Guerry  <bzg@altern.org>

+ 5 - 0
org.el

@@ -23648,12 +23648,17 @@ the cursor position."
   (interactive)
   (interactive)
   (org-agenda-execute-calendar-command 'list-calendar-holidays))
   (org-agenda-execute-calendar-command 'list-calendar-holidays))
 
 
+(defvar calendar-longitude)
+(defvar calendar-latitude)
+(defvar calendar-location-name)
+
 (defun org-agenda-sunrise-sunset (arg)
 (defun org-agenda-sunrise-sunset (arg)
   "Display sunrise and sunset for the cursor date.
   "Display sunrise and sunset for the cursor date.
 Latitude and longitude can be specified with the variables
 Latitude and longitude can be specified with the variables
 `calendar-latitude' and `calendar-longitude'.  When called with prefix
 `calendar-latitude' and `calendar-longitude'.  When called with prefix
 argument, latitude and longitude will be prompted for."
 argument, latitude and longitude will be prompted for."
   (interactive "P")
   (interactive "P")
+  (require 'solar)
   (let ((calendar-longitude (if arg nil calendar-longitude))
   (let ((calendar-longitude (if arg nil calendar-longitude))
 	(calendar-latitude  (if arg nil calendar-latitude))
 	(calendar-latitude  (if arg nil calendar-latitude))
 	(calendar-location-name
 	(calendar-location-name