diff options
author | Bastien Guerry <bzg@altern.org> | 2011-06-29 01:56:40 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-06-29 01:56:40 +0200 |
commit | 7311ac5d4f755340a2046426f2a0d159f9d90368 (patch) | |
tree | 56be7b579e8d1e2d81652c5047e2b18aea9dfc53 | |
parent | f9cc3f525b68556ff49c964b62182f6fa892107c (diff) | |
download | org-mode-7311ac5d4f755340a2046426f2a0d159f9d90368.tar.gz |
Keep warning cookie when timestamping/rescheduling/redeadlining.
* install/git/org-mode/lisp/org.el (org-deadline, org-schedule):
keep warning cookie when rescheduling/redeadlining.
(org-time-stamp): Fix problem with warning cookie.
-rw-r--r-- | lisp/org.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el index d918a24..5e09119 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -11653,7 +11653,7 @@ scheduling will use the corresponding date." (let* ((old-date (org-entry-get nil "DEADLINE")) (repeater (and old-date (string-match - "\\([.+]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" + "\\([.+-]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" old-date) (match-string 1 old-date)))) (if remove @@ -11693,7 +11693,7 @@ scheduling will use the corresponding date." (let* ((old-date (org-entry-get nil "SCHEDULED")) (repeater (and old-date (string-match - "\\([.+]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" + "\\([.+-]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" old-date) (match-string 1 old-date)))) (if remove @@ -14384,11 +14384,11 @@ at the cursor, it will be modified." (default-input (and ts (org-get-compact-tod ts))) (repeater (save-excursion (save-match-data - (end-of-line) - (when (re-search-backward - "\\([.+-]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" - (- (point) 20) t) - (match-string 1))))) + (beginning-of-line) + (when (re-search-forward + "\\([.+-]+[0-9]+[dwmy] ?\\)+" ;;\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" + (save-excursion (progn (end-of-line) (point))) t) + (match-string 0))))) org-time-was-given org-end-time-was-given time) (cond ((and (org-at-timestamp-p t) |