Merge from emacs-23

[gnu-emacs] / lisp / locate.el

diff --git a/lisp/locate.el b/lisp/locate.el
index ce1154c97399889d25dc4c304bee279190f58421..f58b95710e24f17aeef86ab339f8c28cf1c2bab1 100644 (file)
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -325,7 +325,7 @@ then `locate-post-command-hook'."
 
        (locate-do-setup search-string)))
     (and (not (string-equal (buffer-name) locate-buffer-name))
-       (switch-to-buffer-other-window locate-buffer-name))
+       (pop-to-buffer locate-buffer-name))
 
     (run-hooks 'dired-mode-hook)
     (dired-next-line 3)                        ;move to first matching file.