Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

[gnu-emacs] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 566f15975967709b55a2241d8e6454bd9cb37984..f0fda357705839eb42db0cac84aed9d9df07244c 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -136,9 +136,9 @@ and then returns."
                     (setq config (current-window-configuration))
                     (pop-to-buffer " *Metahelp*" nil t)
                     (and (fboundp 'make-frame)
-                         (not (eq (window-frame (selected-window))
+                         (not (eq (window-frame)
                                   prev-frame))
-                         (setq new-frame (window-frame (selected-window))
+                         (setq new-frame (window-frame)
                                config nil))
                     (setq buffer-read-only nil)
                     (let ((inhibit-read-only t))