mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:37:52 +00:00
Code Releases Activity

org-refile.el: Small refactoring, fix a minor bug

Browse source 
* lisp/org-refile.el (org-refile-get-location): Small
refactoring and fix a minor bug, duplicating refile targets
available for completion.

Thanks to Gustavo Barros for the detailed explanations about
this bug.
This commit is contained in:
Bastien 2020-02-13 00:28:51 +01:00
parent be93859c78
commit 63fd0c09ca
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/org-refile.el
View file

@ -773,26 +773,29 @@ this function appends the default value from
org-refile-target-table))
(completion-ignore-case t)
cdef
(last-refile-loc (car org-refile-history))
(last-refile-loc-path (concat last-refile-loc
(if org-refile-use-outline-path "/")))
(prompt (concat prompt
(or (and (car org-refile-history)
(concat " (default " (car org-refile-history) ")"))
(or (and last-refile-loc
(concat " (default " last-refile-loc ")"))
(and (assoc cbnex tbl) (setq cdef cbnex)
(concat " (default " cbnex ")"))) ": "))
pa answ parent-target child parent old-hist)
(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))))
nil 'org-refile-history (or cdef last-refile-loc-path)))
(if (setq pa (org-refile--get-location answ tbl))
(progn
(org-refile-check-position pa)
(when (or (not org-refile-history)
(not (eq old-hist org-refile-history))
(not (equal (car pa) (car org-refile-history))))
(not (equal (car pa) last-refile-loc)))
(setq org-refile-history
(cons (car pa) (if (assoc (car org-refile-history) tbl)
(cons (car pa) (if (assoc last-refile-loc tbl)
org-refile-history
(cdr org-refile-history))))
(when (equal (car org-refile-history) (nth 1 org-refile-history))
(when (equal last-refile-loc (nth 1 org-refile-history))
(pop org-refile-history)))
pa)
(if (string-match "\\`\\(.*\\)/\\([^/]+\\)\\'" answ)