Release 5.19a

org-install.el

@@ -8,7 +8,7 @@
 ;;;;;;  org-remember-insinuate org-open-at-point-global org-insert-link-global
 ;;;;;;  org-store-link orgtbl-mode turn-on-orgtbl org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
-;;;;;;  org-cycle org-mode) "org" "org.el" (18320 37851))
+;;;;;;  org-cycle org-mode) "org" "org.el" (18320 41932))
 ;;; Generated autoloads from org.el
 
 (autoload (quote org-mode) "org" "\

org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.19
+;; Version: 5.19a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -84,7 +84,7 @@
 
 ;;; Version
 
-(defconst org-version "5.19"
+(defconst org-version "5.19a"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -13601,7 +13601,7 @@ See also the variable `org-reverse-note-order'."
 		  (fastp org-default-notes-file)
 		  ((and org-remember-use-refile-when-interactive
 			org-refile-targets)
-		   nil)
+		   org-default-notes-file)
 		  (t (org-get-org-file))))
 	   (heading org-remember-default-headline)
 	   (visiting (and file (org-find-base-buffer-visiting file)))
@@ -13647,7 +13647,7 @@ See also the variable `org-reverse-note-order'."
       (goto-char (point-min))
       (when (and org-remember-use-refile-when-interactive
 		 (not fastp))
-	(org-refile)
+	(org-refile nil (or visiting (find-file-noselect file)))
 	(throw 'quit t))
       ;; Find the file
       (if (not visiting) (find-file-noselect file))
@@ -13776,10 +13776,11 @@ See also the variable `org-reverse-note-order'."
 (defvar org-agenda-new-buffers nil
   "Buffers created to visit agenda files.")
 
-(defun org-get-refile-targets ()
+(defun org-get-refile-targets (&optional default-buffer)
   "Produce a table with refile targets."
   (let ((entries (or org-refile-targets '((nil . (:level . 1)))))
 	org-agenda-new-buffers targets txt re files f desc descre)
+    (with-current-buffer (or default-buffer (current-buffer))
       (while (setq entry (pop entries))
 	(setq files (car entry) desc (cdr entry))
 	(cond
@@ -13844,7 +13845,7 @@ See also the variable `org-reverse-note-order'."
 		    (push (list txt f re (point)) targets))
 		  (goto-char (point-at-eol))))))))
       (org-release-buffers org-agenda-new-buffers)
-    (nreverse targets)))
+      (nreverse targets))))
   
 (defun org-get-outline-path ()
   (let (rtn)
@@ -13857,7 +13858,7 @@ See also the variable `org-reverse-note-order'."
 (defvar org-refile-history nil
   "History for refiling operations.")
 
-(defun org-refile (&optional reversed-or-update)
+(defun org-refile (&optional reversed-or-update default-buffer)
   "Move the entry at point to another heading.
 The list of target headings is compiled using the information in
 `org-refile-targets', which see.  This list is created upon first use, and
@@ -13871,13 +13872,12 @@ variable for the duration of the command."
   (interactive "P")
   (if (equal reversed-or-update '(16))
       (progn
-	(setq org-refile-target-table (org-get-refile-targets))
+	(setq org-refile-target-table (org-get-refile-targets default-buffer))
 	(message "Refile targets updated (%d targets)"
 		 (length org-refile-target-table)))
     (when (or (not org-refile-target-table)
-	      (and (= (length org-refile-targets) 1)
-		   (not (caar org-refile-targets))))
-      (setq org-refile-target-table (org-get-refile-targets)))
+	      (assq nil org-refile-targets))
+      (setq org-refile-target-table (org-get-refile-targets default-buffer)))
     (unless org-refile-target-table
       (error "No refile targets"))
     (let* ((cbuf (current-buffer))