[Orgmode] Untracked working tree file error with git pull

2008-04-09 Thread Manish
Hello, While trying to get my latest org-mode fix from git this is what I got. , | lappy:~/elisp/org-mode $ time git pull | Updating 2537ddc..862f6cb | fatal: Untracked working tree file 'contrib/ChangeLog' would be overwritten by merge. | | real0m8.943s |

[Orgmode] calendar.el (Was: orgmode.org down ?)

2008-04-09 Thread Gijs Hillenius
Heya This maybe related, so just in case: calendar.el is being worked on in cvs. I was/am experiencing some glitches with calendar .. see gnus.emacs.help Gijs -- Smithers: What are you going to do with the million dollars, sir? Burns:Oh, I dunno. Throw it on the pile, I suppose.

Re: [Orgmode] Untracked working tree file error with git pull

2008-04-09 Thread Carsten Dominik
I believe this may be caused by the fact that I have renamed CONTRIB to contrib. On a system which has no distinction between upper and lowercase names, maybe this leads to a conflict? Try removing the entire CONTRIB directory. If that fails, try to get a new clone of the repo. -

Re: [Orgmode] Untracked working tree file error with git pull

2008-04-09 Thread Manish
While trying to get my latest org-mode fix from git this is what I got. , | lappy:~/elisp/org-mode $ time git pull | Updating 2537ddc..862f6cb | fatal: Untracked working tree file 'contrib/ChangeLog' would be overwritten by merge.

Re: [Orgmode] [PATCH 2/5] Add a way to set a user-defined function to generate descriptions for links.

2008-04-09 Thread Carsten Dominik
Applied, but with renaming org-make-link-description to org-make-link- description-function. Thanks. - Carsten On Mar 16, 2008, at 5:29 PM, James TD Smith wrote: From: James TD Smith [EMAIL PROTECTED] Below is an example which uses w3m to retrieve the titles of web pages to use as link

Re: [Orgmode] [PATCH 5/5] clipboard handling in remember templats

2008-04-09 Thread Carsten Dominik
Hi James, I am going to accept this patch, but I do have a question about it: On Mar 16, 2008, at 5:31 PM, James TD Smith wrote: From: James TD Smith [EMAIL PROTECTED] Fix the X clipboard handling so it works properly, and so it works in XEmacs,and add a new % expansion for adding links.

Re: [Orgmode] [PATCH 4/5] Add a new sort option, which sorts items by todo keyword

2008-04-09 Thread Carsten Dominik
Cool. I like this on a lot. And I don't have a good idea how to fix the problem with equal keywords in different sequences. Accepted, thanks. - Carsten On Mar 16, 2008, at 5:30 PM, James TD Smith wrote: This is a somewhat simple implementation which just uses the position of the keyword

Re: [Orgmode] [PATCH 3/5] Some improvements to org-table-export

2008-04-09 Thread Carsten Dominik
Also this is a fine addition, thank you very much. - Carsten On Mar 16, 2008, at 5:29 PM, James TD Smith wrote: From: James TD Smith [EMAIL PROTECTED] Specify the file to export to as parameter or property Use the export mechanisms from orgtbl instead of the simple export. Specify the table

Re: [Orgmode] Agenda view for logging?

2008-04-09 Thread Carsten Dominik
On Apr 9, 2008, at 7:00 PM, Jose Robins wrote: Thanks Manish for the response. I didn't realize I had to schedule it as well. Now it works... Well, how else should the agenda know on which date the entry should be shown... - Carsten Thanks, Manish wrote: On Wed, Apr 9, 2008

Re: [Orgmode] Agenda view for logging?

2008-04-09 Thread Jose Robins
Thanks Manish for the response. I didn't realize I had to schedule it as well. Now it works... Thanks, Manish wrote: On Wed, Apr 9, 2008 at 1:01 AM, Jose Robins wrote: I'm slowly getting familiar with the agenda view. I see that the agenda view shows the

Re: [Orgmode] [PATCH 5/5] clipboard handling in remember templats

2008-04-09 Thread James TD Smith
On 2008-04-09 17:32:22(+0200), Carsten Dominik wrote: Hi James, I am going to accept this patch, but I do have a question about it: On Mar 16, 2008, at 5:31 PM, James TD Smith wrote: From: James TD Smith [EMAIL PROTECTED] org.el | 56

Re: [Orgmode] Agenda view for logging?

2008-04-09 Thread Jose Robins
Carsten Dominik wrote: On Apr 9, 2008, at 7:00 PM, Jose Robins wrote: Thanks Manish for the response. I didn't realize I had to schedule it as well. Now it works... Well, how else should the agenda know on which date the entry should be shown... - Carsten My (apparently flawed)

Re: [Orgmode] Agenda view for logging?

2008-04-09 Thread Manish
On Thu, Apr 10, 2008 at 1:26 AM, Jose Robins wrote: Carsten Dominik wrote: On Apr 9, 2008, at 7:00 PM, Jose Robins wrote: Thanks Manish for the response. I didn't realize I had to schedule it as well. Now it works... Well, how else should the agenda know on which date the entry should