From 4828e3c2d069be03cd9146297df60ffee5f08520 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Wed, 2 Feb 2011 11:04:50 +0100
Subject: [PATCH] Fix bug when using org-schedule/org-deadline on timestamps
 with complex repeaters.

* org.el (org-schedule, org-deadline): Fix bug: take care of
repeating timestamps like ".+1d/3d" or "+1d 10d".
---
 lisp/org.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 0dcc5f4e3..5051d066d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11472,7 +11472,9 @@ scheduling will use the corresponding date."
   (interactive "P")
   (let* ((old-date (org-entry-get nil "DEADLINE"))
 	 (repeater (and old-date
-			(string-match "\\([.+]+[0-9]+[dwmy]\\) ?" old-date)
+			(string-match 
+			 "\\([.+]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?" 
+			 old-date)
 			(match-string 1 old-date))))
     (if remove
 	(progn
@@ -11510,7 +11512,9 @@ scheduling will use the corresponding date."
   (interactive "P")
   (let* ((old-date (org-entry-get nil "SCHEDULED"))
 	 (repeater (and old-date
-			(string-match "\\([.+]+[0-9]+[dwmy]\\) ?" old-date)
+			(string-match 
+			 "\\([.+]+[0-9]+[dwmy]\\(?:[/ ][-+]?[0-9]+[dwmy]\\)?\\) ?"
+			 old-date)
 			(match-string 1 old-date))))
     (if remove
 	(progn