[Orgmode] Re: simultaneous clocks?
Bernt Hansen writes: > Erik Iverson writes: > >> Bernt Hansen wrote: >> >>> I punch in to a default task which starts my clocking day. Everytime I >>> clock out the default task is clocked in to keep every minute clocked >>> from the moment I punch in until I punch out. >> >> That will do! That's all I really wanted, just wasn't aware of all >> the functionality. Thanks, I've found your org-mode.html descriptions >> very helpful. > > I'll make an effort to update my clocking details tonight. Punching in > and out doesn't work automatically in org-mode without a bunch of setup. > > I've been using this setup for a few weeks now and I really like it. The site has been updated. Hopefully I didn't miss anything important. -Bernt ___ 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
[Orgmode] Re: simultaneous clocks?
Erik Iverson writes: > Bernt Hansen wrote: >> Erik Iverson writes: >> >>> Hello, >>> >>> Is there any concept of being able to run multiple, simultaneous >>> clocks in org-mode. For example, I want one clock to track my total >>> hours during the week at work, i.e., punch in and punch out. >> >> No. Org-mode clocking clocks a single task at a time. You can't do two >> things at once :) >> >>> Then, while that clock is running, I would use the normal clocking >>> functionality to keep track of time on specific projects. >> >> I punch in to a default task which starts my clocking day. Everytime I >> clock out the default task is clocked in to keep every minute clocked >> from the moment I punch in until I punch out. > > That will do! That's all I really wanted, just wasn't aware of all > the functionality. Thanks, I've found your org-mode.html descriptions > very helpful. I'll make an effort to update my clocking details tonight. Punching in and out doesn't work automatically in org-mode without a bunch of setup. I've been using this setup for a few weeks now and I really like it. -Bernt ___ 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
[Orgmode] Re: simultaneous clocks?
Bernt Hansen wrote: Erik Iverson writes: Hello, Is there any concept of being able to run multiple, simultaneous clocks in org-mode. For example, I want one clock to track my total hours during the week at work, i.e., punch in and punch out. No. Org-mode clocking clocks a single task at a time. You can't do two things at once :) Then, while that clock is running, I would use the normal clocking functionality to keep track of time on specific projects. I punch in to a default task which starts my clocking day. Everytime I clock out the default task is clocked in to keep every minute clocked from the moment I punch in until I punch out. That will do! That's all I really wanted, just wasn't aware of all the functionality. Thanks, I've found your org-mode.html descriptions very helpful. ___ 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
[Orgmode] Re: simultaneous clocks?
Erik Iverson writes: > Hello, > > Is there any concept of being able to run multiple, simultaneous > clocks in org-mode. For example, I want one clock to track my total > hours during the week at work, i.e., punch in and punch out. No. Org-mode clocking clocks a single task at a time. You can't do two things at once :) > > Then, while that clock is running, I would use the normal clocking > functionality to keep track of time on specific projects. I punch in to a default task which starts my clocking day. Everytime I clock out the default task is clocked in to keep every minute clocked from the moment I punch in until I punch out. Publishing my current clocking setup is on my todo list and will be on http://doc.norang.ca/org-mode.html soon. > > As it is, clocking into a new task clocks out of the current task. > > There may not be a way, but thought I'd ask! Regards, Bernt ___ 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
[Orgmode] org-mobile-push error with no headings
Howdy all, I just upgraded to org-mode 6.36c, and for some reason `org-mobile-push' started throwing an error when it got to a file with no headings in it. The error was in `org-back-to-heading'. This little one-line patch fixes it, though I'm not certain it's the right thing to do at all: diff --git a/lisp/org.el b/lisp/org.el index c041db1..81f9866 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10851,7 +10851,7 @@ Returns the new TODO keyword, or nil if no state change should occur." (defun org-get-todo-state () (save-excursion -(org-back-to-heading t) +(ignore-errors (org-back-to-heading t)) (and (looking-at org-todo-line-regexp) (match-end 2) (match-string 2 -- Erik Arneson GPG Key ID: 1024D/62DA1D25 Office: +1.541.291.9776 Skype: pymander ___ 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
Re: [Orgmode] [Patch] possible Bug: non-interactive publishing (emacs 22.1)
Sorry for the reply to my own mail. But as Carsten is on vacation, I thought it might make sense to add the `[Patch]' to the subject. This patch fixes batch-mode publishing. Tested in emacs24 like this: sh$ emacs -q -batch --eval='(org-publish "PROJECT_NAME" t)' diff --git a/lisp/org-publish.el b/lisp/org-publish.el index fc18a9a..3f24863 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -756,7 +756,12 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." (save-window-excursion (let* ((org-publish-use-timestamps-flag (if force nil org-publish-use-timestamps-flag))) - (org-publish-projects (list project) + (org-publish-projects + (if (stringp project) + ;; If this function is called in batch mode, + ;; project is still a string here. + (list (assoc project org-publish-project-alist)) + (list project)) ;;;###autoload (defun org-publish-all (&optional force) Regards Sebastian ___ 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
Re: [Orgmode] possible Bug: non-interactive publishing (emacs 22.1)
"orgm...@h-rd.org" writes: > Hi Carsten, > > when using org to publish non-interactively under 22.3.1 I get sometimes an > error, depending on which publishing function I call. This does not happen > during interactive calling of the publishing function (i.e. M-x org-publish > ). > > no error: > emacs -q -batch -l ../org-init.el --eval='(org-publish-all)' > > with error: > emacs -q -batch -l ../org-init.el --eval='(org-publish "h-rd.org" t)' > > (obviously the project h-rd.org exists, and is published without error and > all > components from org-publish-all) > error message: > > Starting emacs > Loading subst-ksc... > Loading subst-gb2312... > Loading subst-big5... > Loading subst-jis... > Debugger entered--Lisp error: (wrong-type-argument listp "h-rd.org") > cdr("h-rd.org") > (plist-get (cdr p) :components) > (setq components (plist-get (cdr p) :components)) > (if (setq components (plist-get ... :components)) (setq rest (append > ... rest) ) > (push p > rtn)) > (while (setq p (pop rest)) (if (setq components ...) (setq rest ...) (push > p > r tn))) > (let ((rest projects-alist) rtn p components) (while (setq p ...) (if ... > ... > ...)) (nreverse (org-publish-delete-dups ...))) > org-publish-expand-projects(("h-rd.org")) > (mapc (lambda (project) (let* ... ... ... ... ... ...)) > (org-publish-expand-pr > ojects projects)) > org-publish-projects(("h-rd.org")) > (let* ((org-publish-use-timestamps-flag ...)) (org-publish-projects (list > proj ect))) > (save-window-excursion (let* (...) (org-publish-projects ...))) > org-publish("h-rd.org" t) > eval((org-publish "h-rd.org" t)) > command-line-1(("-l" "../org-init.el" "--eval=(org-publish \"h-rd.org\" > t)")) > command-line() > normal-top-level() > > emacs finished > > > greetings. And here is a fix for publishing in batch-mode. Please test. It works here, but I use emacs 24 only currently... diff --git a/lisp/org-publish.el b/lisp/org-publish.el index fc18a9a..3f24863 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -756,7 +756,12 @@ Default for SITEMAP-FILENAME is 'sitemap.org'." (save-window-excursion (let* ((org-publish-use-timestamps-flag (if force nil org-publish-use-timestamps-flag))) - (org-publish-projects (list project) + (org-publish-projects + (if (stringp project) + ;; If this function is called in batch mode, + ;; project is still a string here. + (list (assoc project org-publish-project-alist)) + (list project)) ;;;###autoload (defun org-publish-all (&optional force) Best wishes Sebastian ___ 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
Re: [Orgmode] Re: [ANN] Exporter for taskjuggler
On Tue, Jun 8, 2010 at 2:51 PM, Christian Egli wrote: > Manish writes: > >> From where can I get the latest version of org-taskjuggler? > > I finally managed to push the taskjuggler exporter to the public repo. > It's located in the branch taskjuggler-export and should be ready to > be merged into the mainline. Thank you. I hope to try it soon with TJ3 on Windows. Regards -- Manish ___ 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
Re: [Orgmode] Re: simultaneous clocks?
To "punch in and punch out" I use: timeclock.el --in addition to a mix of OrgMode and PlannerMode But to be very precise on each task I do: timeclock.el works great for me. ;-) On Wed, Jun 9, 2010 at 2:53 PM, Erik L. Arneson wrote: > Erik Iverson writes: > > Hello, > > Hi, Erik! > > > Is there any concept of being able to run multiple, simultaneous > > clocks in org-mode. For example, I want one clock to track my total > > hours during the week at work, i.e., punch in and punch out. > > > > Then, while that clock is running, I would use the normal clocking > > functionality to keep track of time on specific projects. > > > > As it is, clocking into a new task clocks out of the current task. > > > > There may not be a way, but thought I'd ask! > > I do this by using a special clocktable block that reads an entire > agenda. Try this on for size: > > #+BEGIN: clocktable :maxlevel 3 :scope agenda :block thisweek > #+END > > It adds up all time spent on various tasks and gives me a total. I > suppose you can't really have two clocks running at once, but this works > great for me. > > -- > Erik Arneson > GPG Key ID: 1024D/62DA1D25 > Office: +1.541.291.9776 > Skype: pymander > > > ___ > 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 > ___ 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
[Orgmode] Re: simultaneous clocks?
Erik Iverson writes: > Hello, Hi, Erik! > Is there any concept of being able to run multiple, simultaneous > clocks in org-mode. For example, I want one clock to track my total > hours during the week at work, i.e., punch in and punch out. > > Then, while that clock is running, I would use the normal clocking > functionality to keep track of time on specific projects. > > As it is, clocking into a new task clocks out of the current task. > > There may not be a way, but thought I'd ask! I do this by using a special clocktable block that reads an entire agenda. Try this on for size: #+BEGIN: clocktable :maxlevel 3 :scope agenda :block thisweek #+END It adds up all time spent on various tasks and gives me a total. I suppose you can't really have two clocks running at once, but this works great for me. -- Erik Arneson GPG Key ID: 1024D/62DA1D25 Office: +1.541.291.9776 Skype: pymander ___ 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
[Orgmode] simultaneous clocks?
Hello, Is there any concept of being able to run multiple, simultaneous clocks in org-mode. For example, I want one clock to track my total hours during the week at work, i.e., punch in and punch out. Then, while that clock is running, I would use the normal clocking functionality to keep track of time on specific projects. As it is, clocking into a new task clocks out of the current task. There may not be a way, but thought I'd ask! ___ 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
Re: [Orgmode] Just discovered the date-tree capability of Remember
On 9 June 2010 03:30, Charles Cave wrote: > Well done! Maybe I will write a short tutorial. Please do, this feature looks rather interesting! All the best, Uwe ___ 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
Re: [Orgmode] Beamer presentation in the document
Hi Sébastien, Sébastien Vauban writes: [...] > > 1. How could I use the same table in the slides as in the document, without >copy/pasting it? > >Is there, maybe, some Babel black magic at hand? Export/import? > The following babel solution should work. It uses a code block to copy the contents of the table into the presentation on export. I think I'll add the "echo" code block in the below example to the library of babel, so in the future this should work w/o having to include the code block in the file. --8<---cut here---start->8--- #+TITLE: Complete Minimal Example #+AUTHOR:Sébastien Vauban #+EMAIL: wxhgmqzgw...@spammotel.com #+DATE: 2010-06-09 #+LANGUAGE: en_US # This code block won't show in any export #+source: echo #+begin_src emacs-lisp :var tab='(("echo")) :exports none tab #+end_src * Document ** results #+ATTR_LaTeX: align=lr #+tblname: rate-&-interests | Rate (%) | Interests | |--+| | 3.50 | 2564935.21 | | 4.00 | 2931354.52 | | 4.50 | 3297773.83 | | 5.00 | 3664193.15 | | 5.50 | 4030612.46 | * presentation Amounts -- here is the table #+call: echo(tab=rate-&-interests) :exports results #+ATTR_LaTeX: align=lr #+results: echo(tab=rate-&-interests) | Rate (%) | Interests | |--+| | 3.5 | 2564935.21 | | 4.0 | 2931354.52 | | 4.5 | 3297773.83 | | 5.0 | 3664193.15 | | 5.5 | 4030612.46 | --8<---cut here---end--->8--- Best -- Eric ___ 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
RE: [Orgmode] Display inline images patch
I use org-mode on Windows 7. It seems that the regexp for image files excludes the ":" (colon) character. Could it be added to this: "[-+./_0-9a-zA-Z]+" to make this "[-+./:_0-9a-zA-Z]+" ? -Original Message- From: emacs-orgmode-bounces+orgmode=cfraizer@gnu.org [mailto:emacs-orgmode-bounces+orgmode=cfraizer@gnu.org] On Behalf Of Carsten Dominik Sent: Tuesday, June 01, 2010 9:37 AM To: Russell Adams Cc: emacs-orgmode Subject: Re: [Orgmode] Display inline images patch Hi Russel, looks like you are not running the latest version, I think this is already fixed - Carsten On May 31, 2010, at 9:30 PM, Russell Adams wrote: > I got irritated by my point jumping to the end of the buffer every > time I toggled inline image display, so lets save excursion. ;] > > $ diff -Narub org.el~ org.el > --- org.el~ 2010-05-20 10:12:45.0 -0500 > +++ org.el2010-05-31 14:28:21.0 -0500 > @@ -15489,6 +15489,7 @@ > is how it will work for export. When INCLUDE-LINKED is set, also > links > with a description part will be inlined." > (interactive "P") > + (save-excursion > (org-remove-inline-images) > (goto-char (point-min)) > (let ((re (concat "\\[\\[\\(file:\\|\\./\\)\\(~?" > "[-+./_0-9a-zA-Z]+" > @@ -15501,7 +15502,7 @@ > (setq ov (make-overlay (match-beginning 0) (match-end 0))) > (overlay-put ov 'display (create-image file)) > (overlay-put ov 'face 'default) > - (push ov org-inline-image-overlays) > + (push ov org-inline-image-overlays)) > > (defun org-remove-inline-images () > "Remove inline display of images." > > > > > > > -- > Russell Adamsrlad...@adamsinfoserv.com > > PGP Key ID: 0x1160DCB3 http://www.adamsinfoserv.com/ > > Fingerprint:1723 D8CA 4280 1EC9 557F 66E8 1154 E018 1160 DCB3 > > ___ > 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 ___ 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 ___ 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
[Orgmode] possible Bug: non-interactive publishing (emacs 22.1)
Hi Carsten, when using org to publish non-interactively under 22.3.1 I get sometimes an error, depending on which publishing function I call. This does not happen during interactive calling of the publishing function (i.e. M-x org-publish ). no error: emacs -q -batch -l ../org-init.el --eval='(org-publish-all)' with error: emacs -q -batch -l ../org-init.el --eval='(org-publish "h-rd.org" t)' (obviously the project h-rd.org exists, and is published without error and all components from org-publish-all) error message: Starting emacs Loading subst-ksc... Loading subst-gb2312... Loading subst-big5... Loading subst-jis... Debugger entered--Lisp error: (wrong-type-argument listp "h-rd.org") cdr("h-rd.org") (plist-get (cdr p) :components) (setq components (plist-get (cdr p) :components)) (if (setq components (plist-get ... :components)) (setq rest (append ... rest) ) (push p rtn)) (while (setq p (pop rest)) (if (setq components ...) (setq rest ...) (push p r tn))) (let ((rest projects-alist) rtn p components) (while (setq p ...) (if ... ... ...)) (nreverse (org-publish-delete-dups ...))) org-publish-expand-projects(("h-rd.org")) (mapc (lambda (project) (let* ... ... ... ... ... ...)) (org-publish-expand-pr ojects projects)) org-publish-projects(("h-rd.org")) (let* ((org-publish-use-timestamps-flag ...)) (org-publish-projects (list proj ect))) (save-window-excursion (let* (...) (org-publish-projects ...))) org-publish("h-rd.org" t) eval((org-publish "h-rd.org" t)) command-line-1(("-l" "../org-init.el" "--eval=(org-publish \"h-rd.org\" t)")) command-line() normal-top-level() emacs finished greetings. ___ 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
[Orgmode] Bug: documention missing
Hi Carsten, The following export (publishing) variables are not documented in org 6.36c: :body-only :style-include-scripts They are available for customize, but not documented in the info file under: 13.1.5 Options for the HTML/LaTeX exporters greetings. ___ 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
[Orgmode] Beamer presentation in the document
Hi, Got a few questions about a beamer presentation that is a subtree in the document. Let's take this example: --8<---cut here---start->8--- #+TITLE: Complete Minimal Example #+AUTHOR:Sébastien Vauban #+EMAIL: wxhgmqzgw...@spammotel.com #+DATE: 2010-06-09 #+LANGUAGE: en_US * Document ** Amounts *** Data Here, I study different cases, with the data provided by the client. *** Assumptions Having made the following assumptions: - first - second - third *** Results I get this resulting table: #+ATTR_LaTeX: align=lr | Rate (%) | Interests | |--+| | 3.50 | 2564935.21 | | 4.00 | 2931354.52 | | 4.50 | 3297773.83 | | 5.00 | 3664193.15 | | 5.50 | 4030612.46 | #+TBLFM: $2=(73283863*$1)/100;%.2f * Presentation :PROPERTIES: :TITLE: Beamer slides :LaTeX_CLASS: beamer :LaTeX_CLASS_OPTIONS: [presentation,t] :BEAMER_FRAME_LEVEL: 1 :BEAMER_HEADER_EXTRA: \usetheme{default}\usecolortheme{default} :COLUMNS: %40ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra) :END: ** Amounts - Here is the table: #+ATTR_LaTeX: align=lr | Rate (%) | Interests | |--+| | 3.50 | 2564935.21 | | 4.00 | 2931354.52 | | 4.50 | 3297773.83 | | 5.00 | 3664193.15 | | 5.50 | 4030612.46 | #+TBLFM: $2=(73283863*$1)/100;%.2f See document for full analysis. --8<---cut here---end--->8--- Questions are: 1. How could I use the same table in the slides as in the document, without copy/pasting it? Is there, maybe, some Babel black magic at hand? Export/import? 2. How can I use a title, for the slides, different from the heading `Presentation'? You can see that my `TITLE' property gets ignored. 3. How can I easily switch between exporting: - the document, or - the slides? I guess I must use include/exclude tags? Right? Anything standardized in that direction? Best regards, Seb PS- Carsten, have hyper-ultra-mega nice holidays! -- Sébastien Vauban ___ 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
Re: [Orgmode] Re: Date Prompt Bug (or Anomoly)
On 06/08/2010 05:27 PM, Nick Dokos wrote: Carsten and Nick, Many thanks, that did it. (I wasn't re-making the .elc's---'Doh). Dan Daniel E. Doherty wrote: Carsten, When I tried this last Saturday, I was reluctant to reply since the git server appeared to be down and your message made me think I did not have the latest git version. I tried it again today, and still no joy. I am using org-mode version 6.36a on emacs 23.1 on ubuntu. The latest entry in the Changelog file is , | 2010-06-08 Christian Egli | | * org-taskjuggler.el (org-export-taskjuggler-old-level): | define local variable to avoid compiler warning. ` The following is straight from an org file: , | Attempted on:<2010-06-08 Tue>. | Entering "3/21":<2021-07-03 Sat>. | Entering "7/21":<2021-07-07 Wed>. ` I assume that the fix would be in the function org-read-date-analyze, but I see no recent Changelog entries mentioning it. Is it possible this got lost while the git server was down? No, it is fixed by the following commit, but 6.36a is too old to include it. Either you did not get the updates you thought you did, or you did not remake your org, or you did not reload the newly made org. Try git show 420dd96768262cb15c8bcf4fa6386361e0327add in your git repository to see whether you have the update. If you don't, pull again. If you do have it, do make clean; make and in emacs M-x org-reload Then M-x org-version should say something like: Org-mode version 6.36trans (release_6.36.155.g420d) HTH, Nick --- commit 420dd96768262cb15c8bcf4fa6386361e0327add Author: Carsten Dominik Date: Fri Jun 4 12:29:31 2010 +0200 Fix the date prompt for american-style dates * lisp/org.el (org-read-date-analyze): Fix regular expression for matching american dates Daniel E. Doherty writes: > In playing around with the date prompt (C-.), I ran across the following > puzzling behavior from rather simple inputs. > > I entered the following on June 1, 2010. Here is a date entered as > "3/15":<2011-03-15 Tue>. It interpreted it as the upcoming March 15 as > expected. > > But here is a date entered as "5/21":<2021-06-05 Sat>. Note how it > interpreted the "21" as the year 2021, not at all what I expected from > the documentation or the analogous "3/15" example. > > Maybe there is some underlying logic here that I'm not getting. Perhaps > it has to do with how 2-digit years are interpreted? > > What's going on here? I am using org-version 6.36trans on emacs 23.1. What was going on here is that the regular expression for matching american-style dates was wrong. It was looking for month numbers in the second field and day numbers in the first field - wrong, of course. diff --git a/lisp/org.el b/lisp/org.el index 64044b4..48fd215 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13942,10 +13942,15 @@ The prompt will suggest to enter an ISO date, but you can also enter anything which will at least partially be understood by `parse-time-string'. Unrecognized parts of the date will default to the current day, month, year, hour and minute. If this command is called to replace a timestamp at point, -of to enter the second timestamp of a range, the default time is taken from the -existing stamp. For example, +of to enter the second timestamp of a range, the default time is taken +from the existing stamp. Furthermore, the command prefers the future, +so if you are giving a date where the year is not given, and the day-month +combination is already past in the current year, it will assume you +mean next year. For details, see the manual. A few examples: + 3-2-5 --> 2003-02-05 feb 15--> currentyear-02-15 + 2/15 --> currentyear-02-15 sep 12 9 --> 2009-09-12 12:45 --> today 12:45 22 sept 0:34 --> currentyear-09-22 0:34 @@ -14191,7 +14196,7 @@ user." t nil ans))) ;; Help matching american dates, like 5/30 or 5/30/7 (when (string-match - "^ *\\([0-3]?[0-9]\\)/\\([0-1]?[0-9]\\)\\(/\\([0-9]+\\)\\)?\\([^/0-9]\\|$\\)" ans) + "^ *\\(0?[1-9]\\|1[012]\\)/\\(0?[1-9]\\|[12][0-9]\\|3[01]\\)\\(/\\([0-9]+\\)\\)?\\([^/0-9]\\|$\\)" ans) (setq year (if (match-end 4) (string-to-number (match-string 4 ans)) (progn (setq kill-year t) ___ 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