summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-30 12:42:13 +0100
committerBastien Guerry <bzg@altern.org>2014-01-30 12:42:13 +0100
commit53c664c4ec4c8ec265dbc85a35dc4862a57a82ce (patch)
tree5e94bf2dca8ae4e1464803e55ed8743fa7c2fab9
parentf3ed0f7c6c85487439511cfddaee6d32ca70b108 (diff)
downloadorg-mode-541a1d1701362bafe8032f24d1d3679d193dcca8.tar.gz
org.el (org-refile--get-location): New internal functionrelease_8.2.5h
* org.el (org-refile--get-location): New internal function using a wider set of possible refile locations. (org-refile-get-location): Use it.
-rw-r--r--lisp/org.el17
1 files changed, 13 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2067827..4827594 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11641,6 +11641,17 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(bookmark-jump "org-refile-last-stored")
(message "This is the location of the last refile"))
+(defun org-refile--get-location (refloc tbl)
+ "When user refile to REFLOC, find the associated target in TBL.
+Also check `org-refile-target-table'."
+ (car (delq
+ nil
+ (mapcar
+ (lambda (r) (or (assoc r tbl)
+ (assoc r org-refile-target-table)))
+ (list (replace-regexp-in-string "/$" "" refloc)
+ (replace-regexp-in-string "\\([^/]\\)$" "\\1/" refloc))))))
+
(defun org-refile-get-location (&optional prompt default-buffer new-nodes
no-exclude)
"Prompt the user for a refile location, using PROMPT.
@@ -11694,8 +11705,7 @@ this is used for the GOTO interface."
(setq old-hist org-refile-history)
(setq answ (funcall cfunc prompt tbl nil (not new-nodes)
nil 'org-refile-history (or cdef (car org-refile-history))))
- (setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl)))
- (if pa
+ (if (setq pa (org-refile--get-location answ tbl))
(progn
(org-refile-check-position pa)
(when (or (not org-refile-history)
@@ -11712,8 +11722,7 @@ this is used for the GOTO interface."
(progn
(setq parent (match-string 1 answ)
child (match-string 2 answ))
- (setq parent-target (or (assoc parent tbl)
- (assoc (concat parent "/") tbl)))
+ (setq parent-target (org-refile--get-location parent tbl))
(when (and parent-target
(or (eq new-nodes t)
(and (eq new-nodes 'confirm)