Commit 3820f429 authored by Carsten Dominik's avatar Carsten Dominik Committed by Romain Francoise

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.
parent fac580eb
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.
2010-06-22 Glenn Morris <rgm@gnu.org>
* org-entities.el: Add explicit utf-8 coding cookie to file with
......
......@@ -3981,7 +3981,6 @@ MATCH is being ignored."
"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 @@ argument, latitude and longitude will be prompted for."
(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)))
......
......@@ -72,8 +72,19 @@
(eval-when-compile
(require 'cl)
(require 'gnus-sum)
(require 'calendar))
(require 'gnus-sum))
(require 'calendar)
;; Emacs 22 calendar compatibility: Make sure the new variables are available
(unless (boundp 'calendar-view-holidays-initially-flag)
(defvaralias 'calendar-view-holidays-initially-flag
'view-calendar-holidays-initially))
(unless (boundp 'calendar-view-diary-initially-flag)
(defvaralias 'calendar-view-diary-initially-flag
'view-diary-entries-initially))
(unless (boundp 'diary-fancy-buffer)
(defvaralias 'diary-fancy-buffer 'fancy-diary-buffer))
;; For XEmacs, noutline is not yet provided by outline.el, so arrange for
;; the file noutline.el being loaded.
(if (featurep 'xemacs) (condition-case nil (require 'noutline)))
......@@ -13516,9 +13527,7 @@ user."
(calendar-frame-setup nil)
(calendar-move-hook nil)
(calendar-view-diary-initially-flag nil)
(view-diary-entries-initially nil)
(calendar-view-holidays-initially-flag nil)
(view-calendar-holidays-initially nil)
(timestr (format-time-string
(if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def))
(prompt (concat (if prompt (concat prompt " ") "")
......@@ -14578,9 +14587,7 @@ A prefix ARG can be used to force the current date."
(let ((tsr org-ts-regexp) diff
(calendar-move-hook nil)
(calendar-view-holidays-initially-flag nil)
(view-calendar-holidays-initially nil)
(calendar-view-diary-initially-flag nil)
(view-diary-entries-initially nil))
(calendar-view-diary-initially-flag nil))
(if (or (org-at-timestamp-p)
(save-excursion
(beginning-of-line 1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment