*** empty log message ***

lisp/abbrevlist.el

@@ -32,7 +32,7 @@
 	  abbrev-table)
 	(setq abbrev-list (sort abbrev-list 'string-lessp))
 	(while abbrev-list
-	  (if (> (+ first-column 40) (screen-width))
+	  (if (> (+ first-column 40) (frame-width))
 	      (progn
 		(insert "\n")
 		(setq first-column 0)))

lisp/buff-menu.el

@@ -61,7 +61,7 @@ Letters do not insert themselves; instead, they are commands.
 \\[Buffer-menu-mark] -- mark buffer to be displayed.
 \\[Buffer-menu-select] -- select buffer of line point is on.
   Also show buffers marked with m in other windows.
-\\[Buffer-menu-1-window] -- select that buffer in full-screen window.
+\\[Buffer-menu-1-window] -- select that buffer in full-frame window.
 \\[Buffer-menu-2-window] -- select that buffer in one window,
   together with buffer selected before this one in another window.
 \\[Buffer-menu-this-window] -- select that buffer in place of the buffer menu buffer.
@@ -239,7 +239,7 @@ You can mark buffers with the \\<Buffer-menu-mode-map>\\[Buffer-menu-mark] comma
 	(insert ?\ ))
       (or (eq tem buff) (memq tem others) (setq others (cons tem others))))
     (setq others (nreverse others)
-	  tem (/ (1- (screen-height)) (1+ (length others))))
+	  tem (/ (1- (frame-height)) (1+ (length others))))
     (delete-other-windows)
     (switch-to-buffer buff)
     (or (eq menu buff)
@@ -260,7 +260,7 @@ You can mark buffers with the \\<Buffer-menu-mode-map>\\[Buffer-menu-mark] comma
       (error "Specified buffer has no file"))))
 
 (defun Buffer-menu-1-window ()
-  "Select this line's buffer, alone, in full screen."
+  "Select this line's buffer, alone, in full frame."
   (interactive)
   (switch-to-buffer (Buffer-menu-buffer t))
   (bury-buffer (other-buffer))

lisp/calendar/appt.el

@@ -291,7 +291,7 @@ Therefore, you need to have `(display-time)' in your .emacs file."
     ;; Make sure we're not in the minibuffer
     ;; before splitting the window.
 
-    (if (= (screen-height)
+    (if (= (frame-height)
            (nth 3 (window-edges (selected-window))))
         nil
       (appt-select-lowest-window)
@@ -313,7 +313,7 @@ Therefore, you need to have `(display-time)' in your .emacs file."
           (beep 1))
       (kill-buffer appt-disp-buf))))
 
-;; Select the lowest window on the screen.
+;; Select the lowest window on the frame.
 (defun appt-select-lowest-window ()
   (setq lowest-window (selected-window))
   (let* ((bottom-edge (car (cdr (cdr (cdr (window-edges))))))

src/frame.c

+
 /* Generic frame functions.
    Copyright (C) 1989, 1992 Free Software Foundation.
 
@@ -884,7 +885,8 @@ store_frame_param (f, prop, val)
 DEFUN ("frame-parameters", Fframe_parameters, Sframe_parameters, 0, 1, 0,
   "Return the parameters-alist of frame FRAME.\n\
 It is a list of elements of the form (PARM . VALUE), where PARM is a symbol.\n\
-The meaningful PARMs depend on the kind of frame.")
+The meaningful PARMs depend on the kind of frame.\n\
+If FRAME is omitted, return information on the currently selected frame.")
   (frame)
      Lisp_Object frame;
 {
@@ -953,6 +955,11 @@ The meaningful PARMs depend on the kind of frame; undefined PARMs are ignored.")
 }
 
 
+#if 0
+/* This function isn't useful enough by itself to include; we need to
+   add functions to allow the user to find the size of a font before
+   this is actually useful.  */
+
 DEFUN ("frame-pixel-size", Fframe_pixel_size, 
        Sframe_pixel_size, 1, 1, 0,
   "Return a cons (width . height) of FRAME's size in pixels.")
@@ -968,6 +975,10 @@ DEFUN ("frame-pixel-size", Fframe_pixel_size,
   return Fcons (make_number (x_pixel_width (f)),
 		make_number (x_pixel_height (f)));
 }
+#endif
+
+#if 0
+/* These functions have no C callers, and can be written nicely in lisp.  */
 
 DEFUN ("frame-height", Fframe_height, Sframe_height, 0, 0, 0,
   "Return number of lines available for display on selected frame.")
@@ -982,6 +993,7 @@ DEFUN ("frame-width", Fframe_width, Sframe_width, 0, 0, 0,
 {
   return make_number (FRAME_WIDTH (selected_frame));
 }
+#endif
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,
   "Specify that the frame FRAME has LINES lines.\n\
@@ -1084,6 +1096,7 @@ off the frame.")
 
   return Qt;
 }
+
 
 #ifndef HAVE_X11
 DEFUN ("rubber-band-rectangle", Frubber_band_rectangle, Srubber_band_rectangle,