Emacs 24; view-diary-entries-initially

[Tomas Dahlqvist <tomas.dahlqvist@gmail.com>]

I have started using Emacs 24 from git. When I tried org-time-stamp I
got an error since org sets some variables which calendar wants to
treat as aliases. I tried removing the setting of these variables from
org. This works for emacs 24, but does this work for Emacs 22 and 23?
Should this be changed in Emacs 24 instead of in Org? Is this already
changed in later versions of org?

The diff below is from the git version of Emacs 24 which uses org 6.35i.

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 1cec8a8..7309fd8 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -7313,9 +7313,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)))

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 98179ed..88dcb4e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -13516,9 +13516,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 +14576,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)

Tomas Dahlqvist