From 7a9275fd89813a9dbba93b1dce38d92fccf03387 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sun, 14 Jun 2009 08:03:14 +0200 Subject: [PATCH] Consistent behavior when changing TODO keywords with S-cursor. When the variable `org-treat-S-cursor-todo-selection-as-state-change' is turned off, switching TODO keywords with S-cursor will not only turn off logging, but also blocking. --- lisp/org.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 11bf31f9a..36fdea9c9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3794,6 +3794,7 @@ This variable is set by `org-before-change-function'. (defvar org-inhibit-startup nil) ; Dynamically-scoped param. (defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. (defvar org-inhibit-logging nil) ; Dynamically-scoped param. +(defvar org-inhibit-blocking nil) ; Dynamically-scoped param. (defvar org-table-buffer-is-an nil) (defconst org-outline-regexp "\\*+ ") @@ -9003,7 +9004,8 @@ For calling through lisp, arg is also interpreted in the following way: (when (equal arg '(64)) (setq arg nil org-blocker-hook nil)) (when (and org-blocker-hook - (org-entry-get nil "NOBLOCKING")) + (or org-inhibit-blocking + (org-entry-get nil "NOBLOCKING"))) (setq org-blocker-hook nil)) (save-excursion (catch 'exit @@ -14352,6 +14354,8 @@ Depending on context, this does one of the following: ((and (not (eq org-support-shift-select 'always)) (org-on-heading-p)) (let ((org-inhibit-logging + (not org-treat-S-cursor-todo-selection-as-state-change)) + (org-inhibit-blocking (not org-treat-S-cursor-todo-selection-as-state-change))) (org-call-with-arg 'org-todo 'right))) ((or (and org-support-shift-select @@ -14384,6 +14388,8 @@ Depending on context, this does one of the following: ((and (not (eq org-support-shift-select 'always)) (org-on-heading-p)) (let ((org-inhibit-logging + (not org-treat-S-cursor-todo-selection-as-state-change)) + (org-inhibit-blocking (not org-treat-S-cursor-todo-selection-as-state-change))) (org-call-with-arg 'org-todo 'left))) ((or (and org-support-shift-select