From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Maus Subject: [accepted] Fix task cloning for repeating tasks Date: Sun, 4 Mar 2012 20:23:33 +0100 (CET) Message-ID: <20120304192333.AD5D2E85@w500.ictsoc.de> References: <1330137796-18986-1-git-send-email-bernt@norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:49049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4H1v-0007Az-VC for emacs-orgmode@gnu.org; Sun, 04 Mar 2012 14:23:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4H1t-0002o5-Om for emacs-orgmode@gnu.org; Sun, 04 Mar 2012 14:23:39 -0500 Received: from app1a.xlhost.de ([213.202.242.161]:47295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4H1t-0002nz-Hk for emacs-orgmode@gnu.org; Sun, 04 Mar 2012 14:23:37 -0500 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Patch 1185 (http://patchwork.newartisans.com/patch/1185/) is now "accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1330137796-18986-1-git-send-email-bernt%40norang.ca%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [O] Fix task cloning for repeating tasks > Date: Sat, 25 Feb 2012 07:43:16 -0000 > From: Bernt Hansen > X-Patchwork-Id: 1185 > Message-Id: <1330137796-18986-1-git-send-email-bernt@norang.ca> > To: emacs-orgmode@gnu.org > Cc: Bernt Hansen > > * org.el (org-clone-subtree-with-time-shift): Fix task cloning for > repeating tasks using .+n and ++n syntax > > Tasks with repeaters using .+n and ++n syntax retain the repeater in > all of the clones causing duplicate tasks. These tasks are now > handled the same as the regular repeating task using +n syntax. > > --- > Doh! Let's fix the changelog entry... (missing * in the previous version) > > -Bernt > > lisp/org.el | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lisp/org.el b/lisp/org.el > index a81f7fc..f24c69f 100644 > --- a/lisp/org.el > +++ b/lisp/org.el > @@ -7946,7 +7946,7 @@ the following will happen: > repeater intact. > - the start days in the repeater in the original entry will be shifted > to past the last clone. > -I this way you can spell out a number of instances of a repeating task, > +In this way you can spell out a number of instances of a repeating task, > and still retain the repeater to cover future instances of the task." > (interactive "nNumber of clones to produce: \nsDate shift per clone (e.g. +1w, empty to copy unchanged): ") > (let (beg end template task idprop > @@ -7973,7 +7973,7 @@ and still retain the repeater to cover future instances of the task." > (setq end (point)) > (setq template (buffer-substring beg end)) > (when (and doshift > - (string-match "<[^<>\n]+ \\+[0-9]+[dwmy][^<>\n]*>" template)) > + (string-match "<[^<>\n]+ [.+]?\\+[0-9]+[dwmy][^<>\n]*>" template)) > (delete-region beg end) > (setq end beg) > (setq nmin 0 nmax (1+ nmax) n-no-remove nmax)) > @@ -8004,7 +8004,7 @@ and still retain the repeater to cover future instances of the task." > (while (re-search-forward org-ts-regexp nil t) > (save-excursion > (goto-char (match-beginning 0)) > - (if (looking-at "<[^<>\n]+\\( +\\+[0-9]+[dwmy]\\)") > + (if (looking-at "<[^<>\n]+\\( +[.+]?\\+[0-9]+[dwmy]\\)") > (delete-region (match-beginning 1) (match-end 1))))))) > (setq task (buffer-string))) > (insert task)) >