Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org

[bpt/emacs.git] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 63ae02e..566f159 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,6 +1,6 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
@@ -134,7 +134,7 @@ and then returns."
                   (when (or (eq char ??) (eq char help-char)
                             (memq char help-event-list))
                     (setq config (current-window-configuration))
-                    (switch-to-buffer-other-window "*Help*")
+                    (pop-to-buffer " *Metahelp*" nil t)
                     (and (fboundp 'make-frame)
                          (not (eq (window-frame (selected-window))
                                   prev-frame))