ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org.el: Use the current file name as the default target when there is no refile history 

* org.el (org-refile-get-location): Use the current file name
as the default target when there is no refile history.
This commit is contained in:
Bastien Guerry 2012-09-23 10:04:29 +02:00
parent 1fea5530e3
commit f19af99d2a
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.el
View File

@ -11114,11 +11114,7 @@ this is used for the GOTO interface."
(org-refile-get-targets default-buffer excluded-entries))) (org-refile-get-targets default-buffer excluded-entries)))
(unless org-refile-target-table (unless org-refile-target-table
(error "No refile targets")) (error "No refile targets"))
(let* ((prompt (concat prompt (let* ((cbuf (current-buffer))
(and (car org-refile-history)
(concat " (default " (car org-refile-history) ")"))
": "))
(cbuf (current-buffer))
(partial-completion-mode nil) (partial-completion-mode nil)
(cfn (buffer-file-name (buffer-base-buffer cbuf))) (cfn (buffer-file-name (buffer-base-buffer cbuf)))
(cfunc (if (and org-refile-use-outline-path (cfunc (if (and org-refile-use-outline-path
@ -11126,6 +11122,7 @@ this is used for the GOTO interface."
'org-olpath-completing-read 'org-olpath-completing-read
'org-icompleting-read)) 'org-icompleting-read))
(extra (if org-refile-use-outline-path "/" "")) (extra (if org-refile-use-outline-path "/" ""))
(cbnex (concat (buffer-name) extra))
(filename (and cfn (expand-file-name cfn))) (filename (and cfn (expand-file-name cfn)))
(tbl (mapcar (tbl (mapcar
(lambda (x) (lambda (x)
@ -11138,10 +11135,16 @@ this is used for the GOTO interface."
(cons (concat (car x) extra) (cdr x)))) (cons (concat (car x) extra) (cdr x))))
org-refile-target-table)) org-refile-target-table))
(completion-ignore-case t) (completion-ignore-case t)
cdef
(prompt (concat prompt
(or (and (car org-refile-history)
(concat " (default " (car org-refile-history) ")"))
(and (assoc cbnex tbl) (setq cdef cbnex)
(concat " (default " cbnex ")"))) ": "))
pa answ parent-target child parent old-hist) pa answ parent-target child parent old-hist)
(setq old-hist org-refile-history) (setq old-hist org-refile-history)
(setq answ (funcall cfunc prompt tbl nil (not new-nodes) (setq answ (funcall cfunc prompt tbl nil (not new-nodes)
nil 'org-refile-history (car org-refile-history))) nil 'org-refile-history (or cdef (car org-refile-history))))
(setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl))) (setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl)))
(org-refile-check-position pa) (org-refile-check-position pa)
(if pa (if pa