*** empty log message ***

13 files changed, 46 insertions, 46 deletions

diff --git a/lisp/emulation/mlconvert.el b/lisp/emulation/mlconvert.el
index 54b177792c8..ec6d93eb4a1 100644
--- a/lisp/emulation/mlconvert.el
+++ b/lisp/emulation/mlconvert.el
@@ -248,8 +248,8 @@
 (ml-expansion 'file-modified-time "you-lose-on-file-modified-time")
 (ml-expansion 'needs-checkpointing "you-lose-on-needs-checkpointing")
 
-(ml-expansion 'lines-on-screen "set-screen-height")
-(ml-expansion 'columns-on-screen "set-screen-width")
+(ml-expansion 'lines-on-screen "set-frame-height")
+(ml-expansion 'columns-on-screen "set-frame-width")
 
 (ml-expansion 'dumped-emacs "t")
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index b502f457899..24b09eb6bcf 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -40,8 +40,8 @@
 (garbage-collect)
 (load "window")
 (garbage-collect)
-(if (fboundp 'delete-screen)
-    (load "screen"))
+(if (fboundp 'delete-frame)
+    (load "frame"))
 (garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (garbage-collect)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7df1c7380ce..a9f6c864fec 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -647,10 +647,10 @@ The seventh argument ACTIONS is a list of actions to take
   (mail noerase to subject in-reply-to cc replybuffer sendactions))
 
 ;;;###autoload
-(defun mail-other-screen (&optional noerase to subject in-reply-to cc replybuffer sendactions)
-  "Like `mail' command, but display mail buffer in another screen."
+(defun mail-other-frame (&optional noerase to subject in-reply-to cc replybuffer sendactions)
+  "Like `mail' command, but display mail buffer in another frame."
   (interactive "P")
-  (let ((pop-up-screens t))
+  (let ((pop-up-frames t))
     (pop-to-buffer "*mail*"))
   (mail noerase to subject in-reply-to cc replybuffer sendactions))
 
@@ -659,7 +659,7 @@ The seventh argument ACTIONS is a list of actions to take
 (define-key ctl-x-4-map "m" 'mail-other-window)
 
 ;;;###autoload
-(define-key ctl-x-5-map "m" 'mail-other-screen)
+(define-key ctl-x-5-map "m" 'mail-other-frame)
 
 
 ;;; Do not add anything but external entries on this page.
diff --git a/lisp/register.el b/lisp/register.el
index a78a046a56a..abf5d97d656 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -22,7 +22,7 @@
 (defvar register-alist nil
   "Alist of elements (NAME . CONTENTS), one for each Emacs register.
 NAME is a character (a number).  CONTENTS is a string, number,
-screen configuration, mark or list.
+frame configuration, mark or list.
 A list represents a rectangle; its elements are strings.")
 
 (defun get-register (char)
@@ -40,11 +40,11 @@ A list represents a rectangle; its elements are strings.")
 
 (defun point-to-register (char arg)
   "Store current location of point in register REGISTER.
-With prefix argument, store current screen configuration.
+With prefix argument, store current frame configuration.
 Use \\[jump-to-register] to go to that location or restore that configuration.
 Argument is a character, naming the register."
   (interactive "cPoint to register: \nP")
-  (set-register char (if arg (current-screen-configuration) (point-marker))))
+  (set-register char (if arg (current-frame-configuration) (point-marker))))
 
 (fset 'register-to-point 'jump-to-register)
 (defun jump-to-register (char)
@@ -53,13 +53,13 @@ Argument is a character, naming the register."
   (interactive "cJump to register: ")
   (let ((val (get-register char)))
     (condition-case ()
-        (set-screen-configuration val)
+        (set-frame-configuration val)
       (error
        (if (markerp val)
            (progn
              (switch-to-buffer (marker-buffer val))
              (goto-char val))
-         (error "Register doesn't contain a buffer position or screen configuration"))))))
+         (error "Register doesn't contain a buffer position or frame configuration"))))))
 
 ;(defun number-to-register (arg char)
 ;  "Store a number in a register.
diff --git a/lisp/startup.el b/lisp/startup.el
index 8437a98e683..43d3e3c2eea 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -76,7 +76,7 @@ altering command-line-args-left to remove them.")
 
 (defvar before-init-hook nil
   "Functions to call after handling urgent options but before loading init file.
-The screen system uses this to open screens to display messages while
+The frame system uses this to open frames to display messages while
 Emacs loads the user's initialization file.")
 
 (defvar after-init-hook nil
diff --git a/lisp/subr.el b/lisp/subr.el
index de97d76b426..ecb119cccfc 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -28,19 +28,19 @@ even if it is active."
     (eq base-window
         (next-window base-window (if nomini 'arg)))))
 
-(defun walk-windows (proc &optional minibuf all-screens)
+(defun walk-windows (proc &optional minibuf all-frames)
   "Cycle through all visible windows, calling PROC for each one.
 PROC is called with a window as argument.
 Optional second arg MINIBUF t means count the minibuffer window
 even if not active.  If MINIBUF is neither t nor nil it means
 not to count the minibuffer even if it is active.
-Optional third arg ALL-SCREENS t means include all windows in all screens;
-otherwise cycle within the selected screen."
+Optional third arg ALL-FRAMES t means include all windows in all frames;
+otherwise cycle within the selected frame."
   (let* ((walk-windows-start (selected-window))
          (walk-windows-current walk-windows-start))
     (while (progn
              (setq walk-windows-current
-                   (next-window walk-windows-current minibuf all-screens))
+                   (next-window walk-windows-current minibuf all-frames))
              (funcall proc walk-windows-current)
              (not (eq walk-windows-current walk-windows-start))))))
 
@@ -205,7 +205,7 @@ The normal global definition of the character C-x indirects to this keymap.")
 (define-key ctl-x-map "4" 'ctl-x-4-prefix)
 
 (defvar ctl-x-5-map (make-sparse-keymap)
-  "Keymap for screen commands.")
+  "Keymap for frame commands.")
 (fset 'ctl-x-5-prefix ctl-x-5-map)
 (define-key ctl-x-map "5" 'ctl-x-5-prefix)
 
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index db7565baecb..fad388337e8 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -218,7 +218,7 @@ Handles wrapped and horizontally scrolled lines correctly."
 
 (defun minibuffer-window-p (window)
   "True iff this WINDOW is minibuffer."
-  (= (screen-height)
+  (= (frame-height)
      (nth 3 (window-edges window))      ; The bottom edge.
      ))
 
@@ -336,11 +336,11 @@ Returns list (window x y) where x and y are relative to window."
               (te (nth 1 we))
               (re (nth 2 we))
               (be (nth 3 we)))
-          (if (= re (screen-width))
+          (if (= re (frame-width))
               ;; include the continuation column with this window
               (setq re (1+ re)))
-          (if (= be (screen-height))
-              ;; include partial line at bottom of screen with this window
+          (if (= be (frame-height))
+              ;; include partial line at bottom of frame with this window
               ;; id est, if window is not multple of char size.
               (setq be (1+ be)))
 
@@ -375,7 +375,7 @@ Returns one of (text scrollbar modeline minibuffer)"
 
 (defun window-line-end (w x y)
   "Return WINDOW column (ignore X) containing end of line Y"
-  (eval-in-window w (save-excursion (move-to-loc (screen-width) y))))
+  (eval-in-window w (save-excursion (move-to-loc (frame-width) y))))
 
 ;;;
 ;;; The encoding of mouse events into a mousemap.
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index 471661f7686..be7e7f0ff4d 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -75,7 +75,7 @@ on modeline		    on \"scroll bar\"	in minibuffer
        (window (sup-pos-to-window x y))
        (edges (window-edges window))
        (old-window (selected-window))
-       (in-minibuf-p (eq y (1- (screen-height))))
+       (in-minibuf-p (eq y (1- (frame-height))))
        (same-window-p (and (not in-minibuf-p) (eq window old-window)))
        (in-modeline-p (eq y (1- (nth 3 edges))))
        (in-scrollbar-p (>= x (1- (nth 2 edges)))))
@@ -190,8 +190,8 @@ X and Y are 0-based character positions in the window."
   )
 
 (defun sup-pos-to-window (x y)
-  "Find window corresponding to screen coordinates.
-X and Y are 0-based character positions on the screen."
+  "Find window corresponding to frame coordinates.
+X and Y are 0-based character positions on the frame."
   (let ((edges (window-edges))
         (window nil))
     (while (and (not (eq window (selected-window)))
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 41cce4b56fb..a3092ea42fa 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -49,7 +49,7 @@ but only if you give this command."
                                                    
 
 ;;; Controlling the screen width.
-(defconst vt100-wide-mode (= (screen-width) 132)
+(defconst vt100-wide-mode (= (frame-width) 132)
   "t if vt100 is in 132-column mode.")
 
 (defun vt100-wide-mode (&optional arg)
@@ -59,4 +59,4 @@ but only if you give this command."
         (if (null arg) (not vt100-wide-mode)
           (> (prefix-numeric-value arg) 0)))
  (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l"))
- (set-screen-width (if vt100-wide-mode 132 80)))
+ (set-frame-width (if vt100-wide-mode 132 80)))
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 162baecd7c1..e2055798f5c 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -1,9 +1,9 @@
 (defun terminal-80-columns ()
   (interactive)
   (send-string-to-terminal "\033[?3l")
-  (set-screen-width 80))
+  (set-frame-width 80))
 
 (defun terminal-132-columns ()
   (interactive)
   (send-string-to-terminal "\033[?3h")
-  (set-screen-width 132))
+  (set-frame-width 132))
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 6430a41ce2e..81a7b321142 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -48,12 +48,12 @@ With an argument N, move to the Nth line from the bottom of the window."
 (defun wyse-50-toggle-screen-width ()
   "Alternate between 80 and 132 columns."
   (interactive)
-  (if (<= (screen-width) 80)
+  (if (<= (frame-width) 80)
       (progn
         (send-string-to-terminal "\e`;")
-        (set-screen-width 131))
+        (set-frame-width 131))
     (send-string-to-terminal "\e`:")
-    (set-screen-width 79)))
+    (set-frame-width 79)))
 
 
 ;;; Define the escape sequences for the function keys.
@@ -162,7 +162,7 @@ With an argument N, move to the Nth line from the bottom of the window."
 (setq kill-emacs-hook
       (function (lambda () (interactive)
                   (send-string-to-terminal
-                   (concat "\ea23R" (1+ (screen-width)) "C\eG0")))))
+                   (concat "\ea23R" (1+ (frame-width)) "C\eG0")))))
 
 (defun enable-arrow-keys ()
   "To be called by term-setup-hook. Overrides 6 Emacs standard keys
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 22237e5e21a..83b1fc9590e 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -61,7 +61,7 @@
 (if (not (eq window-system 'x))
     (error "Loading x-win.el but not compiled for X"))
          
-(require 'screen)
+(require 'frame)
 (require 'mouse)
 
 (setq command-switch-alist
@@ -118,34 +118,34 @@
   (let ((aelt (assoc switch x-switch-definitions)))
     (if aelt
         (if (nth 2 aelt)
-            (setq default-screen-alist
+            (setq default-frame-alist
                   (cons (cons (nth 1 aelt) (nth 2 aelt))
-                        default-screen-alist))
-          (setq default-screen-alist
+                        default-frame-alist))
+          (setq default-frame-alist
                 (cons (cons (nth 1 aelt)
                             (car x-invocation-args))
-                      default-screen-alist)
+                      default-frame-alist)
                 x-invocation-args (cdr x-invocation-args))))))
 
 ;; Handler for switches of the form "-switch n"
 (defun x-handle-numeric-switch (switch)
   (let ((aelt (assoc switch x-switch-definitions)))
     (if aelt
-        (setq default-screen-alist
+        (setq default-frame-alist
               (cons (cons (nth 1 aelt)
                           (string-to-int (car x-invocation-args)))
-                    default-screen-alist)
+                    default-frame-alist)
               x-invocation-args
               (cdr x-invocation-args)))))
 
 ;; Handle the geometry option
 (defun x-handle-geometry (switch)
-  (setq initial-screen-alist (append initial-screen-alist
+  (setq initial-frame-alist (append initial-frame-alist
                                      (x-geometry (car x-invocation-args)))
         x-invocation-args (cdr x-invocation-args)))
 
 (defvar x-display-name nil
-  "The X display name specifying server and X screen.")
+  "The X display name specifying server and X frame.")
 
 (defun x-handle-display (switch)
   (setq x-display-name (car x-invocation-args)
@@ -442,7 +442,7 @@ This returns ARGS with the arguments that have been processed removed."
 ;;; the display.
 (set-input-mode t nil t)
 
-(setq screen-creation-function 'x-create-screen)
+(setq frame-creation-function 'x-create-frame)
 (setq suspend-hook
       '(lambda ()
          (error "Suspending an emacs running under X makes no sense")))
diff --git a/lisp/window.el b/lisp/window.el
index 8369789a9e7..e2a403dff58 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -40,7 +40,7 @@ even if it is active."
     (walk-windows (function (lambda (w)
                               (setq count (+ count 1))))
                   'nomini)
-    (let ((size (/ (screen-height) count)))
+    (let ((size (/ (frame-height) count)))
       (walk-windows (function (lambda (w)
                                 (select-window w)
                                 (enlarge-window (- size (window-height)))))