auto upstream

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d65baebee2..21564f5daa5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-17  Kelly Dean  <kellydeanch@yahoo.com> (tiny change)
+
+        * help-macro.el (make-help-screen): Instead of switch-to-buffer
+        use pop-to-buffer with NORECORD argument t.  As buffer name use
+        *Metahelp* with a leading space (Bug#13190).
+
 2012-12-16  Romain Francoise  <romain@orebokech.com>
 
         * files.el (file-extended-attributes)
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 63ae02eb90d..78972344152 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -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))