Fix deadline/scheduled updating if there is a repeater in *another* stamp

Patch by Paul Holocomb.

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e74b3e9..6a7b920 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-deadline, org-schedule): Allow updating if the
+	relevant time stamp does not have a repeater, i.e. do not require
+	that no time stamp has a repeater.
+
 	* org-agenda.el (org-agenda-align-tags): Don't add a face to the
 	new white space before the tags.
 
diff --git a/lisp/org.el b/lisp/org.el
index 9134e1d..640802a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10710,7 +10710,7 @@ scheduling will use the corresponding date."
 			       org-log-redeadline))
 	  (org-remove-timestamp-with-keyword org-deadline-string)
 	  (message "Item no longer has a deadline."))
-      (if (org-get-repeat)
+      (if (org-get-repeat org-deadline-string)
 	  (error "Cannot change deadline on task with repeater, please do that by hand")
 	(org-add-planning-info 'deadline time 'closed)
 	(when (and old-date org-log-redeadline
@@ -10734,7 +10734,7 @@ scheduling will use the corresponding date."
 			       org-log-reschedule))
 	  (org-remove-timestamp-with-keyword org-scheduled-string)
 	  (message "Item is no longer scheduled."))
-      (if (org-get-repeat)
+      (if (org-get-repeat org-scheduled-string)
 	  (error "Cannot reschedule task with repeater, please do that by hand")
 	(org-add-planning-info 'scheduled time 'closed)
 	(when (and old-date org-log-reschedule