diff options
| author | Bastien <bzg@gnu.org> | 2021-05-25 02:13:55 +0200 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2021-05-25 02:13:55 +0200 |
| commit | c5573bdf4c92f05333a0c6e9e6232e86999a70cd (patch) | |
| tree | e6d155d9d71d82884aa0355c4866cf8efb57041b | |
| parent | f72a658bd057e953a1cdb6f3230b8caae2560d80 (diff) | |
| parent | 37f69bf86dd72ce518c60b6dbbd6afb80a896eeb (diff) | |
| download | org-mode-c5573bdf4c92f05333a0c6e9e6232e86999a70cd.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-refile.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/org-refile.el b/lisp/org-refile.el index bffad0a..678759e 100644 --- a/lisp/org-refile.el +++ b/lisp/org-refile.el @@ -649,20 +649,18 @@ this function appends the default value from (setq old-hist org-refile-history) (setq answ (funcall cfunc prompt tbl nil (not new-nodes) nil 'org-refile-history - (or cdef (concat (car org-refile-history) extra)))) + (or cdef (car org-refile-history)))) (if (setq pa (org-refile--get-location answ tbl)) - (let* ((last-refile-loc (car org-refile-history)) - (last-refile-loc-path (concat last-refile-loc extra))) + (let ((last-refile-loc (car org-refile-history))) (org-refile-check-position pa) (when (or (not org-refile-history) (not (eq old-hist org-refile-history)) - (not (equal (car pa) last-refile-loc-path))) + (not (equal (car pa) last-refile-loc))) (setq org-refile-history (cons (car pa) (if (assoc last-refile-loc tbl) org-refile-history (cdr org-refile-history)))) - (when (or (equal last-refile-loc-path (nth 1 org-refile-history)) - (equal last-refile-loc (nth 1 org-refile-history))) + (when (equal last-refile-loc (nth 1 org-refile-history)) (pop org-refile-history))) pa) (if (string-match "\\`\\(.*\\)/\\([^/]+\\)\\'" answ) |