Make sure the org-goto buffer comes up in the current frame

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2010-02-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-get-location): Make sure the selection buffer is
+	shown in the current frame.
+
 	* org-ascii.el (org-export-ascii-table-widen-columns): New
 	option.
 	(org-export-ascii-preprocess): Realign tables to remove narrowing

lisp/org.el

@@ -5903,7 +5903,11 @@ or nil."
 	(isearch-hide-immediately nil)
 	(isearch-search-fun-function
 	 (lambda () 'org-goto-local-search-headings))
-	(org-goto-selected-point org-goto-exit-command))
+	(org-goto-selected-point org-goto-exit-command)
+	(pop-up-frames nil)
+	(special-display-buffer-names nil)
+	(special-display-regexps nil)
+	(special-display-function nil))
     (save-excursion
       (save-window-excursion
 	(delete-other-windows)