[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100645: Cherry-pick commit 8bd9308 f
From: |
Romain Francoise |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100645: Cherry-pick commit 8bd9308 from the org-mode Git repository. |
Date: |
Sat, 26 Jun 2010 11:53:06 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100645
author: Carsten Dominik <address@hidden>
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-26 11:53:06 +0200
message:
Cherry-pick commit 8bd9308 from the org-mode Git repository.
2010-06-26 Carsten Dominik <address@hidden>
* 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.
modified:
lisp/org/ChangeLog
lisp/org/org-agenda.el
lisp/org/org.el
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2010-06-22 07:51:46 +0000
+++ b/lisp/org/ChangeLog 2010-06-26 09:53:06 +0000
@@ -1,3 +1,13 @@
+2010-06-26 Carsten Dominik <address@hidden>
+
+ * 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 <address@hidden>
* org-entities.el: Add explicit utf-8 coding cookie to file with
=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el 2010-05-05 04:27:16 +0000
+++ b/lisp/org/org-agenda.el 2010-06-26 09:53:06 +0000
@@ -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)))
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2010-05-26 14:19:15 +0000
+++ b/lisp/org/org.el 2010-06-26 09:53:06 +0000
@@ -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 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100645: Cherry-pick commit 8bd9308 from the org-mode Git repository.,
Romain Francoise <=