summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-29 19:25:08 +0200
committerBastien Guerry <bzg@altern.org>2014-05-29 19:25:08 +0200
commitb978abb485cd4fbe8d32f5440ce91b707e7d2b16 (patch)
treea510477b534653ffef1b6e3666a6f530e816f5da
parent8772a2eb49fbe9ac5ad219ff7db8ce692d214d18 (diff)
downloadorg-mode-b978abb485cd4fbe8d32f5440ce91b707e7d2b16.tar.gz
org.el (org-shiftmetaup, org-shiftmetadown): Update behavior
* org.el (org-shiftmetaup, org-shiftmetadown): Don't move the subtree or list item at point up or down, as this feature is already accessible through `org-metaup' and `org-metadown'. Update the docstrings to reflect the new behavior.
-rw-r--r--lisp/org.el22
1 files changed, 10 insertions, 12 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 24d9b99..0137f00 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20030,31 +20030,29 @@ individual commands for more information."
(t (org-modifier-cursor-error))))
(defun org-shiftmetaup (&optional arg)
- "Move subtree up or kill table row.
-Calls `org-move-subtree-up' or `org-table-kill-row' or
-`org-move-item-up' or `org-timestamp-up', depending on context.
-See the individual commands for more information."
+ "Drag the line at point up.
+In a table, kill the current row.
+On a clock timestamp, update the value of the timestamp like `S-<up>'
+but also adjust the previous clocked item in the clock history.
+Everywhere else, drag the line at point up."
(interactive "P")
(cond
((run-hook-with-args-until-success 'org-shiftmetaup-hook))
((org-at-table-p) (call-interactively 'org-table-kill-row))
- ((org-at-heading-p) (call-interactively 'org-move-subtree-up))
- ((org-at-item-p) (call-interactively 'org-move-item-up))
((org-at-clock-log-p) (let ((org-clock-adjust-closest t))
(call-interactively 'org-timestamp-up)))
(t (call-interactively 'org-drag-line-backward))))
(defun org-shiftmetadown (&optional arg)
- "Move subtree down or insert table row.
-Calls `org-move-subtree-down' or `org-table-insert-row' or
-`org-move-item-down' or `org-timestamp-up', depending on context.
-See the individual commands for more information."
+ "Drag the line at point down.
+In a table, insert an empty row at the current line.
+On a clock timestamp, update the value of the timestamp like `S-<down>'
+but also adjust the previous clocked item in the clock history.
+Everywhere else, drag the line at point down."
(interactive "P")
(cond
((run-hook-with-args-until-success 'org-shiftmetadown-hook))
((org-at-table-p) (call-interactively 'org-table-insert-row))
- ((org-at-heading-p) (call-interactively 'org-move-subtree-down))
- ((org-at-item-p) (call-interactively 'org-move-item-down))
((org-at-clock-log-p) (let ((org-clock-adjust-closest t))
(call-interactively 'org-timestamp-down)))
(t (call-interactively 'org-drag-line-forward))))