2008-12-23 Carsten Dominik <dominik@science.uva.nl>

	* org-remember.el (org-remember-handler): Safer way to get a new
	buffer accessing the target file.

	* org.el (org-refile-get-location): Handle case of current buffer
	not having a file associated with it.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 2fa968f04ccb8e54b38249203d155aff502d47b7..9cee6b02a2a7b79390ad3bb6767550d90ba99fed 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-23  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org-remember.el (org-remember-handler): Safer way to get a new
+       buffer accessing the target file.
+
+       * org.el (org-refile-get-location): Handle case of current buffer
+       not having a file associated with it.
+
 2008-12-22  Carsten Dominik  <dominik@science.uva.nl>
 
        * org-table.el (org-table-get-formula): Only ask to overwrite

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index c9575e4b85232c41dd64b25dd085e534048bb5bb..44d8c7f0c9e5737ed52e4f50f8340fa12c898854 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -809,8 +809,7 @@ See also the variable `org-reverse-note-order'."
          (move-marker org-remember-last-stored-marker (point)))
        (throw 'quit t))
       ;; Find the file
-      (if (not visiting) (find-file-noselect file))
-      (with-current-buffer (or visiting (get-file-buffer file))
+      (with-current-buffer (or visiting (find-file-noselect file))
        (unless (org-mode-p)
          (error "Target files for remember notes must be in Org-mode"))
        (save-excursion

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