diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | org-link-edit.el | 64 | ||||
| -rw-r--r-- | test-org-link-edit.el | 44 |
3 files changed, 110 insertions, 2 deletions
@@ -3,3 +3,7 @@ Org Link Edit NEWS -- history of user-visible changes -*- mode: org; -*- * master (unreleased) ** New features + +- New command ~org-link-edit-transport-next-link~ searches for the + next (or previous) link and moves it to point, using the word at + point or the selected region as the link's description. diff --git a/org-link-edit.el b/org-link-edit.el index 833d620..87dcd6c 100644 --- a/org-link-edit.el +++ b/org-link-edit.el @@ -26,8 +26,8 @@ ;; Org Link Edit provides Paredit-inspired slurping and barfing ;; commands for Org link descriptions. ;; -;; There are four commands, all which operate when point is on an Org -;; link. +;; There are four slurp and barf commands, all which operate when +;; point is on an Org link. ;; ;; - org-link-edit-forward-slurp ;; - org-link-edit-backward-slurp @@ -53,6 +53,11 @@ ;; ("i" org-link-edit-backward-barf "backward barf") ;; ("q" nil "cancel"))) ;; +;; In addition to the slurp and barf commands, the command +;; `org-link-edit-transport-next-link' searches for the next (or +;; previous) link and moves it to point, using the word at point or +;; the selected region as the link's description. +;; ;; [1] https://github.com/abo-abo/hydra ;;; Code: @@ -325,5 +330,60 @@ If N is negative, barf trailing blobs instead of leading blobs." (insert barfed) barfed))))) +(defun org-link-edit--next-link-data (&optional previous) + (save-excursion + (if (funcall (if previous #'re-search-backward #'re-search-forward) + org-any-link-re nil t) + (org-link-edit--link-data) + (user-error "No %s link found" (if previous "previous" "next"))))) + +;;;###autoload +(defun org-link-edit-transport-next-link (&optional previous beg end) + "Move the next link to point. + +If the region is active, use the selected text as the link's +description. Otherwise, use the word at point. + +With prefix argument PREVIOUS, move the previous link instead of +the next link. + +Non-interactively, use the text between BEG and END as the +description, moving the next (or previous) link relative BEG and +END." + (interactive (cons current-prefix-arg + (and (use-region-p) + (list (region-beginning) (region-end))))) + (let ((pt (point)) + (desc-bounds (cond + ((and beg end) + (cons (progn (goto-char beg) + (point-marker)) + (progn (goto-char end) + (point-marker)))) + ((not (looking-at-p "\\s-")) + (progn (skip-syntax-backward "w") + (let ((beg (point-marker))) + (skip-syntax-forward "w") + (cons beg (point-marker)))))))) + (when (or (and desc-bounds + (or (progn (goto-char (car desc-bounds)) + (org-link-edit--on-link-p)) + (progn (goto-char (cdr desc-bounds)) + (org-link-edit--on-link-p)))) + (progn (goto-char pt) + (org-link-edit--on-link-p))) + (user-error "Cannot transport next link with point on a link")) + (goto-char (car desc-bounds)) + (cl-multiple-value-bind (link-beg link-end link desc) + (org-link-edit--next-link-data previous) + (unless (or (not desc-bounds) (= (length desc) 0)) + (user-error "Link already has a description")) + (delete-region link-beg link-end) + (insert (org-make-link-string + link + (and desc-bounds + (delete-and-extract-region (car desc-bounds) + (cdr desc-bounds)))))))) + (provide 'org-link-edit) ;;; org-link-edit.el ends here diff --git a/test-org-link-edit.el b/test-org-link-edit.el index 4f006e7..7e4d2af 100644 --- a/test-org-link-edit.el +++ b/test-org-link-edit.el @@ -511,6 +511,50 @@ website" (buffer-string))))) +;;; Transport + +(ert-deftest test-org-link-edit/transport-next-link () + "Test `org-link-edit-transport-next-link'." + (should + (string= "Here is \[\[http://orgmode.org/\]\[Org's\]\] website " + (org-test-with-temp-text + "Here is <point>Org's website http://orgmode.org/" + (org-link-edit-transport-next-link) + (buffer-string)))) + (should + (string= " Here is \[\[http://orgmode.org/\]\[Org's\]\] website" + (org-test-with-temp-text + "http://orgmode.org/ Here is <point>Org's website" + (org-link-edit-transport-next-link 'previous) + (buffer-string)))) + (should + (string= "\[\[http://orgmode.org/\]\[Here is Org's\]\] website " + (org-test-with-temp-text + "Here is Org's<point> website http://orgmode.org/" + (org-link-edit-transport-next-link + nil (point-min) (point)) + (buffer-string)))) + (should + (string= " Here is \[\[http://orgmode.org/\]\[Org's website\]\]" + (org-test-with-temp-text + "http://orgmode.org/ Here is <point>Org's website" + (org-link-edit-transport-next-link + 'previous (point) (point-max)) + (buffer-string)))) + (should-error + (org-test-with-temp-text + "Here is Org's website http://orgmode.org/<point>" + (org-link-edit-transport-next-link) + (buffer-string))) + (should-error + (org-test-with-temp-text + "Here is Org's website <point>http://orgmode.org/" + (org-link-edit-transport-next-link + nil (point-min) (point)) + (buffer-string))) + ) + + ;;; Other (ert-deftest test-org-link-edit/on-link-p () |