From 452f7352f658b5d150a3f1c176de06b4468513f7 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 27 Jan 2009 11:42:32 +0100 Subject: [PATCH] Maintenance: Cleanup and minor fixed. --- lisp/ChangeLog | 10 ++++++++++ lisp/org-agenda.el | 2 +- lisp/org.el | 12 +++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e16abd79..b52ed3a8b 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,15 @@ 2009-01-27 Carsten Dominik + * org.el (org-todo): Return correct state type even if the blocker + throws an error. + (org-modifier-cursor-error): Renamed from + `org-shiftcursor-error'. + (org-shiftmetaleft, org-shiftmetaright, org-shiftmetaup) + (org-shiftmetadown): Call `org-modifier-cursor-error'. + + * org-agenda.el (org-agenda-todo): Call `org-todo' interactively, + to get real errors from the blocker hook. + * org.el (org-shiftselect-error, org-call-for-shift-select): New functions. (org-set-visibility-according-to-property): Turn off the setting diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 66b93d154..e57342cf6 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5084,7 +5084,7 @@ the same tree node, and the headline of the tree node in the Org-mode file." (save-excursion (and (outline-next-heading) (org-flag-heading nil))) ; show the next heading - (org-todo arg) + (call-interactively 'org-todo) (and (bolp) (forward-char 1)) (setq newhead (org-get-heading)) (when (and (org-bound-and-true-p diff --git a/lisp/org.el b/lisp/org.el index a14a58af3..f4be6fa9f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8411,6 +8411,8 @@ For calling through lisp, arg is also interpreted in the following way: :position startpos)) dolog now-done-p) (when org-blocker-hook + (setq org-last-todo-state-is-todo + (not (member this org-done-keywords))) (unless (save-excursion (save-match-data (run-hook-with-args-until-failure @@ -12939,7 +12941,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names." 'delete-backward-char 'org-delete-backward-char) (org-defkey org-mode-map "|" 'org-force-self-insert)) -(defun org-shiftcursor-error () +(defun org-modifier-cursor-error () "Throw an error, a modified cursor command was applied in wrong context." (error "This command is active in special context like tables, headlines or items")) @@ -12977,7 +12979,7 @@ See the individual commands for more information." ((org-at-table-p) (call-interactively 'org-table-delete-column)) ((org-on-heading-p) (call-interactively 'org-promote-subtree)) ((org-at-item-p) (call-interactively 'org-outdent-item)) - (t (org-shiftcursor-error)))) + (t (org-modifier-cursor-error)))) (defun org-shiftmetaright () "Demote subtree or insert table column. @@ -12989,7 +12991,7 @@ See the individual commands for more information." ((org-at-table-p) (call-interactively 'org-table-insert-column)) ((org-on-heading-p) (call-interactively 'org-demote-subtree)) ((org-at-item-p) (call-interactively 'org-indent-item)) - (t (org-shiftcursor-error)))) + (t (org-modifier-cursor-error)))) (defun org-shiftmetaup (&optional arg) "Move subtree up or kill table row. @@ -13001,7 +13003,7 @@ for more information." ((org-at-table-p) (call-interactively 'org-table-kill-row)) ((org-on-heading-p) (call-interactively 'org-move-subtree-up)) ((org-at-item-p) (call-interactively 'org-move-item-up)) - (t (org-shiftcursor-error)))) + (t (org-modifier-cursor-error)))) (defun org-shiftmetadown (&optional arg) "Move subtree down or insert table row. Calls `org-move-subtree-down' or `org-table-insert-row' or @@ -13012,7 +13014,7 @@ commands for more information." ((org-at-table-p) (call-interactively 'org-table-insert-row)) ((org-on-heading-p) (call-interactively 'org-move-subtree-down)) ((org-at-item-p) (call-interactively 'org-move-item-down)) - (t (org-shiftcursor-error)))) + (t (org-modifier-cursor-error)))) (defun org-metaleft (&optional arg) "Promote heading or move table column to left.