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

Remember: Fix bug cause by expand-file-name on nil file.

This commit is contained in:
Carsten Dominik 2008-12-23 06:15:04 +01:00
parent 951d117a47
commit 76e18b30e9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-23 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-refile-get-location): Handle case of current buffer
not having a file associated with it.
2008-12-22 Carsten Dominik <carsten.dominik@gmail.com> 2008-12-22 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-get-formula): Only ask to overwrite * org-table.el (org-table-get-formula): Only ask to overwrite

4
lisp/org.el
View File

@ -7671,13 +7671,13 @@ operation has put the subtree."
(unless org-refile-target-table (unless org-refile-target-table
(error "No refile targets")) (error "No refile targets"))
(let* ((cbuf (current-buffer)) (let* ((cbuf (current-buffer))
(cfn (buffer-file-name (buffer-base-buffer cbuf)))
(cfunc (if (and org-refile-use-outline-path (cfunc (if (and org-refile-use-outline-path
org-outline-path-complete-in-steps) org-outline-path-complete-in-steps)
'org-olpath-completing-read 'org-olpath-completing-read
'org-ido-completing-read)) 'org-ido-completing-read))
(extra (if org-refile-use-outline-path "/" "")) (extra (if org-refile-use-outline-path "/" ""))
(filename (expand-file-name (filename (and cfn (expand-file-name cfn)))
(buffer-file-name (buffer-base-buffer cbuf))))
(tbl (mapcar (tbl (mapcar
(lambda (x) (lambda (x)
(if (not (equal filename (nth 1 x))) (if (not (equal filename (nth 1 x)))