(outline-minor-mode): Use define-minor-mode.

[bpt/emacs.git] / lisp / info-look.el

diff --git a/lisp/info-look.el b/lisp/info-look.el
index ec21adc..e39adb3 100644 (file)
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -332,8 +332,18 @@ If optional argument QUERY is non-nil, query for the help mode."
     (if (or (not info-lookup-other-window-flag)
            (eq (current-buffer) (get-buffer "*info*")))
        (info)
-      (save-window-excursion (info))
-      (switch-to-buffer-other-window "*info*"))
+      (progn
+       (save-window-excursion (info))
+       ;; Determine whether or not the Info buffer is visible in
+       ;; another frame on the same display.  If it is, simply raise
+       ;; that frame.  Otherwise, display it in another window.
+       (let* ((window (get-buffer-window "*info*" t))
+              (info-frame (and window (window-frame window))))
+         (if (and info-frame
+                  (display-multi-frame-p)
+                  (memq info-frame (frames-on-display-list)))
+           (select-frame info-frame)
+         (switch-to-buffer-other-window "*info*")))))
     (while (and (not found) modes)
       (setq doc-spec (info-lookup->doc-spec topic (car modes)))
       (while (and (not found) doc-spec)