Mercurial > emacs
diff lisp/org/org-agenda.el @ 109052:446dbaf86e72
Cherry-pick commit 8bd9308 from the org-mode Git repository.
2010-06-26 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete
variables.
* org.el (calendar): Require calendar now on top level in org.el
and define aliases to new variables when needed.
(org-read-date, org-goto-calendar): Do not bind obsolete
variables.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Sat, 26 Jun 2010 11:53:06 +0200 |
| parents | be3f6d650654 |
| children | a150e8a14679 |
line wrap: on
line diff
--- a/lisp/org/org-agenda.el Fri Jun 25 15:32:37 2010 -0400 +++ b/lisp/org/org-agenda.el Sat Jun 26 11:53:06 2010 +0200 @@ -3981,7 +3981,6 @@ "Get the (Emacs Calendar) diary entries for DATE." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (fancy-diary-buffer diary-fancy-buffer) (diary-display-hook '(fancy-diary-display)) (diary-display-function 'fancy-diary-display) (pop-up-frames nil) @@ -7312,9 +7311,7 @@ (date (calendar-gregorian-from-absolute day)) (calendar-move-hook nil) (calendar-view-holidays-initially-flag nil) - (calendar-view-diary-initially-flag nil) - (view-calendar-holidays-initially nil) - (view-diary-entries-initially nil)) + (calendar-view-diary-initially-flag nil)) (calendar) (calendar-goto-date date)))