|
@@ -2036,8 +2036,6 @@ The following commands are available:
|
|
|
(org-defkey org-agenda-mode-map "y" 'org-agenda-year-view)
|
|
|
(org-defkey org-agenda-mode-map "\C-c\C-z" 'org-agenda-add-note)
|
|
|
(org-defkey org-agenda-mode-map "z" 'org-agenda-add-note)
|
|
|
-(org-defkey org-agenda-mode-map "k" 'org-agenda-action)
|
|
|
-(org-defkey org-agenda-mode-map "\C-c\C-x\C-k" 'org-agenda-action)
|
|
|
(org-defkey org-agenda-mode-map [(shift right)] 'org-agenda-do-date-later)
|
|
|
(org-defkey org-agenda-mode-map [(shift left)] 'org-agenda-do-date-earlier)
|
|
|
(org-defkey org-agenda-mode-map [?\C-c ?\C-x (right)] 'org-agenda-do-date-later)
|
|
@@ -2229,11 +2227,6 @@ The following commands are available:
|
|
|
["Schedule" org-agenda-schedule t]
|
|
|
["Set Deadline" org-agenda-deadline t]
|
|
|
"--"
|
|
|
- ["Mark item" org-agenda-action :active t :keys "k m"]
|
|
|
- ["Show mark item" org-agenda-action :active t :keys "k v"]
|
|
|
- ["Schedule marked item" org-agenda-action :active t :keys "k s"]
|
|
|
- ["Set Deadline for marked item" org-agenda-action :active t :keys "k d"]
|
|
|
- "--"
|
|
|
["Change Date +1 day" org-agenda-date-later (org-agenda-check-type nil 'agenda 'timeline)]
|
|
|
["Change Date -1 day" org-agenda-date-earlier (org-agenda-check-type nil 'agenda 'timeline)]
|
|
|
["Change Time +1 hour" org-agenda-do-date-later :active (org-agenda-check-type nil 'agenda 'timeline) :keys "C-u S-right"]
|
|
@@ -8393,72 +8386,6 @@ ARG is passed through to `org-deadline'."
|
|
|
(org-agenda-show-new-time marker ts "D"))
|
|
|
(message "Deadline for this item set to %s" ts)))
|
|
|
|
|
|
-(defun org-agenda-action ()
|
|
|
- "Select entry for agenda action, or execute an agenda action.
|
|
|
-This command prompts for another letter. Valid inputs are:
|
|
|
-
|
|
|
-m Mark the entry at point for an agenda action
|
|
|
-s Schedule the marked entry to the date at the cursor
|
|
|
-d Set the deadline of the marked entry to the date at the cursor
|
|
|
-r Call `org-remember' with cursor date as the default date
|
|
|
-c Call `org-capture' with cursor date as the default date
|
|
|
-SPC Show marked entry in other window
|
|
|
-TAB Visit marked entry in other window
|
|
|
-
|
|
|
-The cursor may be at a date in the calendar, or in the Org agenda."
|
|
|
- (interactive)
|
|
|
- (let (ans)
|
|
|
- (message "Select action: [m]ark | [s]chedule [d]eadline [r]emember [c]apture [ ]show")
|
|
|
- (setq ans (read-char-exclusive))
|
|
|
- (cond
|
|
|
- ((equal ans ?m)
|
|
|
- ;; Mark this entry
|
|
|
- (if (eq major-mode 'org-agenda-mode)
|
|
|
- (let ((m (or (org-get-at-bol 'org-hd-marker)
|
|
|
- (org-get-at-bol 'org-marker))))
|
|
|
- (if m
|
|
|
- (progn
|
|
|
- (move-marker org-agenda-action-marker
|
|
|
- (marker-position m) (marker-buffer m))
|
|
|
- (message "Entry marked for action; press `k' at desired date in agenda or calendar"))
|
|
|
- (error "Don't know which entry to mark")))
|
|
|
- (error "This command works only in the agenda")))
|
|
|
- ((equal ans ?s)
|
|
|
- (org-agenda-do-action '(org-schedule nil org-overriding-default-time)))
|
|
|
- ((equal ans ?d)
|
|
|
- (org-agenda-do-action '(org-deadline nil org-overriding-default-time)))
|
|
|
- ((equal ans ?r)
|
|
|
- (org-agenda-do-action '(org-remember) t))
|
|
|
- ((equal ans ?c)
|
|
|
- (org-agenda-do-action '(org-capture) t))
|
|
|
- ((equal ans ?\ )
|
|
|
- (let ((cw (selected-window)))
|
|
|
- (org-switch-to-buffer-other-window
|
|
|
- (marker-buffer org-agenda-action-marker))
|
|
|
- (goto-char org-agenda-action-marker)
|
|
|
- (org-show-context 'agenda)
|
|
|
- (select-window cw)))
|
|
|
- ((equal ans ?\C-i)
|
|
|
- (org-switch-to-buffer-other-window
|
|
|
- (marker-buffer org-agenda-action-marker))
|
|
|
- (goto-char org-agenda-action-marker)
|
|
|
- (org-show-context 'agenda))
|
|
|
- (t (error "Invalid agenda action %c" ans)))))
|
|
|
-
|
|
|
-(defun org-agenda-do-action (form &optional current-buffer)
|
|
|
- "Evaluate FORM at the entry pointed to by `org-agenda-action-marker'."
|
|
|
- (let ((org-overriding-default-time (org-get-cursor-date)))
|
|
|
- (if current-buffer
|
|
|
- (eval form)
|
|
|
- (if (not (marker-buffer org-agenda-action-marker))
|
|
|
- (error "No entry has been selected for agenda action")
|
|
|
- (with-current-buffer (marker-buffer org-agenda-action-marker)
|
|
|
- (save-excursion
|
|
|
- (save-restriction
|
|
|
- (widen)
|
|
|
- (goto-char org-agenda-action-marker)
|
|
|
- (eval form))))))))
|
|
|
-
|
|
|
(defun org-agenda-clock-in (&optional arg)
|
|
|
"Start the clock on the currently selected item."
|
|
|
(interactive "P")
|