(make-help-screen): Don't call window-frame in a non-multi-frame Emacs.

1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 83e7b09b35c..55f63f25c5e 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -114,10 +114,11 @@ and then returns."
                          (progn
                            (setq config (current-window-configuration))
                            (switch-to-buffer-other-window "*Help*")
-                           (if (not (eq (window-frame (selected-window))
-                                        prev-frame))
-                               (setq new-frame (window-frame (selected-window))
-                                     config nil))
+                           (and (fboundp 'make-frame)
+                                (not (eq (window-frame (selected-window))
+                                         prev-frame))
+                                (setq new-frame (window-frame (selected-window))
+                                      config nil))
                            (erase-buffer)
                            (insert help-screen)
                            (goto-char (point-min))