[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] org-metaup, org-metadown: Move subtrees in active region
From: |
Ihor Radchenko |
Subject: |
[PATCH 3/4] org-metaup, org-metadown: Move subtrees in active region |
Date: |
Sun, 15 Jan 2023 12:31:31 +0000 |
* lisp/org.el (org-metaup):
(org-metadown): When active region contains headings, move the
containing subtrees according to the selection. Do not deactive
region.
* testing/lisp/test-org.el (test-org/move-subtree): Add test.
---
lisp/org.el | 46 ++++++++++++++++++++++++++++++++++
testing/lisp/test-org.el | 54 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/lisp/org.el b/lisp/org.el
index 9fd8189a7..0c782769d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16888,6 +16888,30 @@ (defun org-metaup (&optional _arg)
(interactive "P")
(cond
((run-hook-with-args-until-success 'org-metaup-hook))
+ ((and (org-region-active-p)
+ (org-with-limited-levels
+ (save-excursion
+ (goto-char (region-beginning))
+ (org-at-heading-p))))
+ (when (org-check-for-hidden 'headlines) (org-hidden-tree-error))
+ (let ((beg (region-beginning))
+ (end (region-end)))
+ (save-excursion
+ (goto-char end)
+ (setq end (point-marker))
+ (goto-char beg)
+ (let ((level (org-current-level)))
+ (when (or (and (> level 1) (re-search-forward (format
"^\\*\\{1,%s\\} " (1- level)) end t))
+ ;; Search previous subtree.
+ (progn
+ (goto-char beg)
+ (beginning-of-line)
+ (not (re-search-backward (format "^\\*\\{%s\\} " level)
nil t))))
+ (user-error "Cannot move past superior level or buffer limit"))
+ ;; Drag first subtree above below the selected.
+ (while (< (point) end)
+ (let ((deactivate-mark nil))
+ (call-interactively 'org-move-subtree-down)))))))
((org-region-active-p)
(let* ((a (save-excursion
(goto-char (region-beginning))
@@ -16925,6 +16949,28 @@ (defun org-metadown (&optional _arg)
(interactive "P")
(cond
((run-hook-with-args-until-success 'org-metadown-hook))
+ ((and (org-region-active-p)
+ (org-with-limited-levels
+ (save-excursion
+ (goto-char (region-beginning))
+ (org-at-heading-p))))
+ (when (org-check-for-hidden 'headlines) (org-hidden-tree-error))
+ (let ((beg (region-beginning))
+ (end (region-end)))
+ (save-excursion
+ (goto-char beg)
+ (setq beg (point-marker))
+ (let ((level (org-current-level)))
+ (when (or (and (> level 1) (re-search-forward (format
"^\\*\\{1,%s\\} " (1- level)) end t))
+ ;; Search next subtree.
+ (progn
+ (goto-char end)
+ (not (re-search-forward (format "^\\*\\{%s\\} " level)
nil t))))
+ (user-error "Cannot move past superior level or buffer limit"))
+ ;; Drag first subtree below above the selected.
+ (while (> (point) beg)
+ (let ((deactivate-mark nil))
+ (call-interactively 'org-move-subtree-up)))))))
((org-region-active-p)
(let* ((a (save-excursion
(goto-char (region-beginning))
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 7ed4ffd19..4c66fa038 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -5091,6 +5091,60 @@ (ert-deftest test-org/previous-block ()
;;; Outline structure
+(ert-deftest test-org/move-subtree ()
+ "Test `org-metaup' and `org-metadown' on headings."
+ (should
+ (equal "* H2\n* H1\n"
+ (org-test-with-temp-text "* H1<point>\n* H2\n"
+ (org-metadown)
+ (buffer-string))))
+ (should
+ (equal "* H2\n* H1\n"
+ (org-test-with-temp-text "* H1\n* H2<point>\n"
+ (org-metaup)
+ (buffer-string))))
+ (should-error
+ (org-test-with-temp-text "* H1\n* H2<point>\n"
+ (org-metadown)
+ (buffer-string)))
+ (should-error
+ (org-test-with-temp-text "* H1<point>\n* H2\n"
+ (org-metaup)
+ (buffer-string)))
+ (should-error
+ (org-test-with-temp-text "* H1\n** H1.2<point>\n* H2"
+ (org-metadown)
+ (buffer-string)))
+ (should-error
+ (org-test-with-temp-text "* H1\n** H1.2<point>\n"
+ (org-metaup)
+ (buffer-string)))
+ ;; With selection
+ (should
+ (equal "* T\n** H3\n** H1\n** H2\n"
+ (org-test-with-temp-text "* T\n** <point>H1\n** H2\n** H3\n"
+ (set-mark (point))
+ (search-forward "H2")
+ (org-metadown)
+ (buffer-string))))
+ (should
+ (equal "* T\n** H1\n** H2\n** H0\n** H3\n"
+ (org-test-with-temp-text "* T\n** H0\n** <point>H1\n** H2\n** H3\n"
+ (set-mark (point))
+ (search-forward "H2")
+ (org-metaup)
+ (buffer-string))))
+ (should-error
+ (org-test-with-temp-text "* T\n** <point>H1\n** H2\n* T2\n"
+ (set-mark (point))
+ (search-forward "H2")
+ (org-metadown)))
+ (should-error
+ (org-test-with-temp-text "* T\n** <point>H1\n** H2\n* T2\n"
+ (set-mark (point))
+ (search-forward "H2")
+ (org-metaup))))
+
(ert-deftest test-org/demote ()
"Test `org-demote' specifications."
;; Add correct number of stars according to `org-odd-levels-only'.
--
2.39.0
- [PATCH 0/4] Structure editing when region is active, Ihor Radchenko, 2023/01/15
- [PATCH 1/4] Preserve active region after structure edits, Ihor Radchenko, 2023/01/15
- [PATCH 2/4] Preserve active region when toggling heading state, Ihor Radchenko, 2023/01/15
- [PATCH 3/4] org-metaup, org-metadown: Move subtrees in active region,
Ihor Radchenko <=
- [PATCH 4/4] org-manual.org: Document changes in 8f6fcd709, 5719a8163, and eda9909a9, Ihor Radchenko, 2023/01/15
- Re: [PATCH 0/4] Structure editing when region is active, Samuel Wales, 2023/01/15