(frame-initialize): Set frame-creation-function to `make-terminal-frame' if

appropriate.

1 files changed, 8 insertions, 5 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 88e088abdc7..a53b3c82eda 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -187,12 +187,15 @@ These supersede the values given in `default-frame-alist'.")
         (delete-frame terminal-frame)
         (setq terminal-frame nil))
 
-    ;; No, we're not running a window system.  Arrange to cause errors.
+    ;; No, we're not running a window system.  Use make-terminal-frame if
+    ;; we support that feature, otherwise arrange to cause errors.
     (setq frame-creation-function
-          (function
-           (lambda (parameters)
-             (error
-              "Can't create multiple frames without a window system"))))))
+          (if (fboundp 'make-terminal-frame)
+              'make-terminal-frame
+            (function
+             (lambda (parameters)
+               (error
+                "Can't create multiple frames without a window system")))))))
 
 ;;; startup.el calls this function after loading the user's init
 ;;; file.  Now default-frame-alist and initial-frame-alist contain