From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Emacs 24; view-diary-entries-initially Date: Fri, 23 Apr 2010 16:25:01 +0200 Message-ID: References: Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5Jom-00072z-Hd for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 10:25:20 -0400 Received: from [140.186.70.92] (port=46951 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5Joh-00070x-9P for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 10:25:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5Joa-0001jJ-5G for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 10:25:15 -0400 Received: from postduif.ic.uva.nl ([145.18.40.180]:52335) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5JoZ-0001j2-UK for emacs-orgmode@gnu.org; Fri, 23 Apr 2010 10:25:08 -0400 In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Tomas Dahlqvist Cc: emacs-orgmode@gnu.org Hi Tomas, this is alrady fixed in the current git version, in a way that is compatible with emacs 22-24. Will in in the Emacs bzr repo soon. Thanks. - Carsten On Apr 23, 2010, at 2:41 PM, Tomas Dahlqvist wrote: > 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 > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten