From f816149589da7ae537e06df4286864954fb86a5f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 7 Sep 2019 15:07:27 -0400 Subject: [PATCH] lang/org: update +org/remove-link To reflects changes made upstream, in org. --- modules/lang/org/autoload/org.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el index a06a19259..1a1bb6430 100644 --- a/modules/lang/org/autoload/org.el +++ b/modules/lang/org/autoload/org.el @@ -298,15 +298,14 @@ wrong places)." (defun +org/remove-link () "Unlink the text at point." (interactive) - (unless (org-in-regexp org-bracket-link-regexp 1) + (unless (org-in-regexp org-link-bracket-re 1) (user-error "No link at point")) (save-excursion - (let ((remove (list (match-beginning 0) (match-end 0))) - (description (if (match-end 3) - (match-string-no-properties 3) - (match-string-no-properties 1)))) - (apply #'delete-region remove) - (insert description)))) + (let ((label (if (match-end 2) + (match-string-no-properties 2) + (org-link-unescape (match-string-no-properties 1))))) + (delete-region (match-beginning 0) (match-end 0)) + (insert label)))) ;;;###autoload (defun +org/toggle-checkbox ()