* completion.el (add-completion-to-head, add-completion): Doc fixes.

[gnu-emacs] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 2c8badf90c2b572be3f239998d3c291ed0ff6ba6..ae0803d6a8db7d906d74f9a96c9fbba9360f49bc 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -630,12 +630,16 @@ TTY should be the file name of the tty device to use.  TYPE
 should be the terminal type string of TTY, for example \"xterm\"
 or \"vt100\".  The optional third argument PARAMETERS specifies
 additional frame parameters."
-  (interactive "fOpen frame on tty device: \nsTerminal type of %s: ")
+  ;; Use "F" rather than "f", in case the device does not exist, as
+  ;; far as the filesystem is concerned.
+  (interactive "FOpen frame on tty device: \nsTerminal type of %s: ")
   (unless tty
     (error "Invalid terminal device"))
   (unless type
     (error "Invalid terminal type"))
-  (make-frame `((window-system . nil) (tty . ,tty) (tty-type . ,type) . ,parameters)))
+  (if (eq window-system 'pc)
+      (make-frame `((window-system . pc) (tty . ,tty) (tty-type . ,type) . ,parameters))
+    (make-frame `((window-system . nil) (tty . ,tty) (tty-type . ,type) . ,parameters))))
 
 (declare-function x-close-connection "xfns.c" (terminal))
 
@@ -670,9 +674,11 @@ If DISPLAY is nil, that stands for the selected frame's display."
       (x-close-connection display))))
 
 (defun make-frame-command ()
-  "Make a new frame, and select it if the terminal displays only one frame."
+  "Make a new frame, on the same terminal as the selected frame.
+If the terminal is a text-only terminal, this also selects the
+new frame."
   (interactive)
-  (if (and window-system (not (eq window-system 'pc)))
+  (if (display-graphic-p)
       (make-frame)
     (select-frame (make-frame))))
 
@@ -1014,7 +1020,7 @@ If FRAME is omitted, describe the currently selected frame."
 (declare-function x-list-fonts "xfaces.c"
                   (pattern &optional face frame maximum width))
 
-(defalias 'set-default-font 'set-frame-font)
+(define-obsolete-function-alias 'set-default-font 'set-frame-font "23.1")
 (defun set-frame-font (font-name &optional keep-size)
   "Set the font of the selected frame to FONT-NAME.
 When called interactively, prompt for the name of the font to use.