emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* New feature: cancel a repeater to allow marking repeating tasks as DONE
@ 2013-11-11 17:17 Bastien
  0 siblings, 0 replies; only message in thread
From: Bastien @ 2013-11-11 17:17 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

Sometimes it's useful to cancel a repeater: for example, when you
want to mark a task as definitely DONE.

The attached patch does this by allowing the user to use -1 as the
numeric prefix argument for `org-todo'.

(It does not delete the repeater, instead it sets it to 0 so that
planning information structure is preserved: for example, you can
have a repeater and a 'start warning in X days' cookie.)

Tests and feedback welcome!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org.el-org-cancel-repeater-New-function.patch --]
[-- Type: text/x-diff, Size: 2233 bytes --]

From 5b8cc031f11a9989a2a72bb1358b2eafc72d6b8b Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Mon, 11 Nov 2013 18:12:06 +0100
Subject: [PATCH 1/2] org.el (org-cancel-repeater): New function

* org.el (org-cancel-repeater): New function.
(org-todo): Use the new function to cancel a repeater when
called with a numeric arg of -1.
---
 lisp/org.el | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 63a27f4..1d65b11 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12124,6 +12124,21 @@ nil or a string to be used for the todo mark." )
 (defvar org-block-entry-blocking ""
   "First entry preventing the TODO state change.")
 
+(defun org-cancel-repeater ()
+  "Cancel a repeater by setting it to zero."
+  (interactive)
+  (save-excursion
+    (org-back-to-heading t)
+    (let ((bound1 (point))
+	  (bound0 (save-excursion (outline-next-heading) (point))))
+      (when (re-search-forward
+	     (concat "\\(" org-scheduled-time-regexp "\\)\\|\\("
+		     org-deadline-time-regexp "\\)\\|\\("
+		     org-ts-regexp "\\)")
+	     bound0 t)
+	(if (re-search-backward "[ \t]+\\(?:[.+]\\)?\\+\\([0-9]+\\)[hdwmy]" bound1 t)
+	    (replace-match "0" t nil nil 1))))))
+
 (defun org-todo (&optional arg)
   "Change the TODO state of an item.
 The state of an item is given by a keyword at the start of the heading,
@@ -12163,6 +12178,7 @@ When called through ELisp, arg is also interpreted in the following way:
 	 org-loop-over-headlines-in-active-region
 	 cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
     (if (equal arg '(16)) (setq arg 'nextset))
+    (when (equal arg -1) (org-cancel-repeater) (setq arg nil))
     (let ((org-blocker-hook org-blocker-hook)
 	  commentp
 	  case-fold-search)
@@ -12828,7 +12844,7 @@ This function is run automatically after each state change to a DONE state."
 	 (org-log-done nil)
 	 (org-todo-log-states nil)
 	 re type n what ts time to-state)
-    (when repeat
+    (when (and repeat (not (zerop (string-to-number repeat))))
       (if (eq org-log-repeat t) (setq org-log-repeat 'state))
       (setq to-state (or (org-entry-get nil "REPEAT_TO_STATE")
 			 org-todo-repeat-to-state))
-- 
1.8.4.2


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-11-11 17:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-11 17:17 New feature: cancel a repeater to allow marking repeating tasks as DONE Bastien

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).