* Emacs 24; view-diary-entries-initially
@ 2010-04-23 12:41 Tomas Dahlqvist
2010-04-23 14:25 ` Carsten Dominik
2010-04-23 14:44 ` Nick Dokos
0 siblings, 2 replies; 6+ messages in thread
From: Tomas Dahlqvist @ 2010-04-23 12:41 UTC (permalink / raw)
To: emacs-orgmode
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: Emacs 24; view-diary-entries-initially
2010-04-23 12:41 Emacs 24; view-diary-entries-initially Tomas Dahlqvist
@ 2010-04-23 14:25 ` Carsten Dominik
2010-04-23 14:44 ` Nick Dokos
1 sibling, 0 replies; 6+ messages in thread
From: Carsten Dominik @ 2010-04-23 14:25 UTC (permalink / raw)
To: Tomas Dahlqvist; +Cc: emacs-orgmode
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Emacs 24; view-diary-entries-initially
2010-04-23 12:41 Emacs 24; view-diary-entries-initially Tomas Dahlqvist
2010-04-23 14:25 ` Carsten Dominik
@ 2010-04-23 14:44 ` Nick Dokos
2010-04-23 16:13 ` Matt Lundin
1 sibling, 1 reply; 6+ messages in thread
From: Nick Dokos @ 2010-04-23 14:44 UTC (permalink / raw)
To: Tomas Dahlqvist; +Cc: nicholas.dokos, emacs-orgmode
Tomas Dahlqvist <tomas.dahlqvist@gmail.com> wrote:
> I have started using Emacs 24 from git.
Just a note for the unwary: the emacs project page says
Note that the CVS and Git repositories are *not* up-to-date.
IOW, you *have* to use bzr to access the sources, if you intend to keep
up-to-date with emacs24 development.
Nick
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Emacs 24; view-diary-entries-initially
2010-04-23 14:44 ` Nick Dokos
@ 2010-04-23 16:13 ` Matt Lundin
2010-04-24 1:39 ` Nick Dokos
0 siblings, 1 reply; 6+ messages in thread
From: Matt Lundin @ 2010-04-23 16:13 UTC (permalink / raw)
To: nicholas.dokos; +Cc: Tomas Dahlqvist, emacs-orgmode
Nick Dokos <nicholas.dokos@hp.com> writes:
> Tomas Dahlqvist <tomas.dahlqvist@gmail.com> wrote:
>
>> I have started using Emacs 24 from git.
>
> Just a note for the unwary: the emacs project page says
>
> Note that the CVS and Git repositories are *not* up-to-date.
>
> IOW, you *have* to use bzr to access the sources, if you intend to keep
> up-to-date with emacs24 development.
>
In my experience, this git mirror stays up-to-date:
http://repo.or.cz/w/emacs.git
Best,
Matt
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Re: Emacs 24; view-diary-entries-initially
2010-04-23 16:13 ` Matt Lundin
@ 2010-04-24 1:39 ` Nick Dokos
2010-04-24 1:47 ` Nick Dokos
0 siblings, 1 reply; 6+ messages in thread
From: Nick Dokos @ 2010-04-24 1:39 UTC (permalink / raw)
To: Matt Lundin; +Cc: Tomas Dahlqvist, nicholas.dokos, emacs-orgmode
Matt Lundin <mdl@imapmail.org> wrote:
> Nick Dokos <nicholas.dokos@hp.com> writes:
>
> > Tomas Dahlqvist <tomas.dahlqvist@gmail.com> wrote:
> >
> >> I have started using Emacs 24 from git.
> >
> > Just a note for the unwary: the emacs project page says
> >
> > Note that the CVS and Git repositories are *not* up-to-date.
> >
> > IOW, you *have* to use bzr to access the sources, if you intend to keep
> > up-to-date with emacs24 development.
> >
>
> In my experience, this git mirror stays up-to-date:
>
> http://repo.or.cz/w/emacs.git
>
Matt,
Thanks very much for the pointer. However, I cannot clone it either
through http or through git:
$ socksify git clone git://repo.or.cz/w/emacs.git
Initialized empty Git repository in /home/nick/src/emacs/emacs.repo/emacs/.git/cd
fatal: The remote end hung up unexpectedly
$ rm -rf emacs
$ git clone http://repo.or.cz/w/emacs.git
Initialized empty Git repository in /home/nick/src/emacs/emacs.repo/emacs/.git/
warning: remote HEAD refers to nonexistent ref, unable to checkout.
This was at work through a SOCKS proxy - I'll try again from home without a proxy,
but in the meantime, can you check whether it works for you?
Thanks,
Nick
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Re: Emacs 24; view-diary-entries-initially
2010-04-24 1:39 ` Nick Dokos
@ 2010-04-24 1:47 ` Nick Dokos
0 siblings, 0 replies; 6+ messages in thread
From: Nick Dokos @ 2010-04-24 1:47 UTC (permalink / raw)
To: nicholas.dokos; +Cc: Tomas Dahlqvist, Matt Lundin, emacs-orgmode
Nick Dokos <nicholas.dokos@hp.com> wrote:
> >
> > In my experience, this git mirror stays up-to-date:
> >
> > http://repo.or.cz/w/emacs.git
> >
>
> Matt,
>
> Thanks very much for the pointer. However, I cannot clone it either
> through http or through git:
>
> $ socksify git clone git://repo.or.cz/w/emacs.git
> Initialized empty Git repository in /home/nick/src/emacs/emacs.repo/emacs/.git/cd
> fatal: The remote end hung up unexpectedly
>
> $ rm -rf emacs
>
> $ git clone http://repo.or.cz/w/emacs.git
> Initialized empty Git repository in /home/nick/src/emacs/emacs.repo/emacs/.git/
> warning: remote HEAD refers to nonexistent ref, unable to checkout.
>
> This was at work through a SOCKS proxy - I'll try again from home without a proxy,
> but in the meantime, can you check whether it works for you?
>
I goofed: the URL Matt posted is not the one to use for cloning. I used
it to visit the site and the correct URLs for cloning are right there in
front of my eyes.
Sorry for the noise,
Nick
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-04-24 1:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-23 12:41 Emacs 24; view-diary-entries-initially Tomas Dahlqvist
2010-04-23 14:25 ` Carsten Dominik
2010-04-23 14:44 ` Nick Dokos
2010-04-23 16:13 ` Matt Lundin
2010-04-24 1:39 ` Nick Dokos
2010-04-24 1:47 ` Nick Dokos
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).