XEmacs 21.2.46 "Urania".

[chise/xemacs-chise.git.1] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 1b98fe3..c8ddc29 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -451,6 +451,7 @@ tty     A standard TTY connection or terminal.  CONNECTION should be
            the Unix command `tty') or nil for XEmacs' standard input
            and output (usually the TTY in which XEmacs started).  Only
            if support for TTY's was compiled into XEmacs.
+gtk        A GTK device.
 ns         A connection to a machine running the NeXTstep windowing
            system.  Not currently implemented.
 mswindows   A connection to a machine running Microsoft Windows NT or
@@ -502,14 +503,14 @@ This deletes all bindings in PLIST for `top', `left', `width',
 Emacs uses this to avoid overriding explicit moves and resizings from
 the user during startup."
   (setq plist (canonicalize-lax-plist (copy-sequence plist)))
-  (mapcar #'(lambda (propname)
-             (if (lax-plist-member plist propname)
+  (mapcar #'(lambda (property)
+             (if (lax-plist-member plist property)
                  (progn
                    (setq frame-initial-geometry-arguments
-                         (cons propname
-                               (cons (lax-plist-get plist propname)
+                         (cons property
+                               (cons (lax-plist-get plist property)
                                      frame-initial-geometry-arguments)))
-                   (setq plist (lax-plist-remprop plist propname)))))
+                   (setq plist (lax-plist-remprop plist property)))))
          '(height width top left user-size user-position))
   plist)
 
@@ -571,8 +572,8 @@ This is equivalent to the type of the frame's device.
 Value is `tty' for a tty frame (a character-only terminal),
 `x' for a frame that is an X window,
 `ns' for a frame that is a NeXTstep window (not yet implemented),
-`mswindows' for a frame that is a Windows NT or Windows 95/97 window,
-`pc' for a frame that is a direct-write MS-DOS frame (not yet implemented),
+`mswindows' for a frame that is a MS Windows desktop window,
+`msprinter' for a frame that is a MS Windows print job,
 `stream' for a stream frame (which acts like a stdio stream), and
 `dead' for a deleted frame."
   (or frame (setq frame (selected-frame)))
@@ -776,7 +777,7 @@ all frames that were visible, and iconify all frames that were not."
     (setq iconification-data (cdr iconification-data))))
 
 (defun suspend-or-iconify-emacs ()
-  "Call iconify-emacs if using a window system, otherwise call suspend-emacs."
+  "Call iconify-emacs if using a window system, otherwise suspend Emacs."
   (interactive)
   (cond ((device-on-window-system-p)
         (iconify-emacs))
@@ -1055,8 +1056,8 @@ prepended to the `default-frame-plist' when creating a frame for the
 first time.
 
 This function may be used as the value of `pre-display-buffer-function',
-to cause the display-buffer function and its callers to exhibit the above
-behavior."
+to cause the `display-buffer' function and its callers to exhibit the
+above behavior."
   (let ((frame (get-frame-for-buffer-noselect
                buffer not-this-window-p on-frame)))
     (if (not (eq frame (selected-frame)))
@@ -1104,7 +1105,7 @@ is first in the list.  VISIBLE-ONLY will only list non-iconified frames."
   :group 'frames)
 
 (defun show-temp-buffer-in-current-frame (buffer)
-  "For use as the value of temp-buffer-show-function:
+  "For use as the value of `temp-buffer-show-function':
 always displays the buffer in the selected frame, regardless of the behavior
 that would otherwise be introduced by the `pre-display-buffer-function', which
 is normally set to `get-frame-for-buffer' (which see)."