*** empty log message ***

6 files changed, 26 insertions, 26 deletions

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")))