summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2008-06-15 08:04:14 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2008-06-15 08:04:14 +0200
commit9db8450a908333fae457732a57f5c3f9858780c3 (patch)
tree080e096d8b879625bf6b93ed54fae6b27bf4b188
parent15ff91c3e41d30fc6ab4cc727fdb8a9b13cb127c (diff)
downloadorg-mode-9db8450a908333fae457732a57f5c3f9858780c3.tar.gz
Don't allow org-schedule/deadline to clobber repeaters.
-rwxr-xr-xlisp/ChangeLog4
-rw-r--r--lisp/org.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a13524..b783fbd 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2008-06-15 Carsten Dominik <dominik@science.uva.nl>
+ * org.el (org-schedule, org-deadline): Protect scheduled and
+ deadline tasks against changes that accidently remove the
+ repeater.
+
* org-remember.el (org-remember-apply-template): Access the
default time stored by `org-store-link'.
diff --git a/lisp/org.el b/lisp/org.el
index 569b721..0c4f1b0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8712,7 +8712,9 @@ With argument REMOVE, remove any deadline from the item."
(progn
(org-remove-timestamp-with-keyword org-deadline-string)
(message "Item no longer has a deadline."))
- (org-add-planning-info 'deadline nil 'closed)))
+ (if (org-get-repeat)
+ (error "Cannot change deadline on task with repeater, please do that by hand")
+ (org-add-planning-info 'deadline nil 'closed))))
(defun org-schedule (&optional remove)
"Insert the SCHEDULED: string with a timestamp to schedule a TODO item.
@@ -8722,7 +8724,9 @@ With argument REMOVE, remove any scheduling date from the item."
(progn
(org-remove-timestamp-with-keyword org-scheduled-string)
(message "Item is no longer scheduled."))
- (org-add-planning-info 'scheduled nil 'closed)))
+ (if (org-get-repeat)
+ (error "Cannot reschedule task with repeater, please do that by hand")
+ (org-add-planning-info 'scheduled nil 'closed))))
(defun org-remove-timestamp-with-keyword (keyword)
"Remove all time stamps with KEYWORD in the current entry."