Mercurial > emacs
diff src/frame.c @ 90650:02cf29720f31
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 07 Nov 2006 23:22:48 +0000 |
parents | 8dd8c8286063 420314603844 |
children | dbe3f29e61d6 |
line wrap: on
line diff
--- a/src/frame.c Tue Nov 07 02:37:49 2006 +0000 +++ b/src/frame.c Tue Nov 07 23:22:48 2006 +0000 @@ -2611,7 +2611,7 @@ extern Lisp_Object Qtop; /* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the - wanted positions of the WM window (not emacs window). + wanted positions of the WM window (not Emacs window). Return in *WIDTH and *HEIGHT the wanted width and height of Emacs window (FRAME_X_WINDOW). */ @@ -4215,7 +4215,7 @@ doc: /* The initial frame-object, which represents Emacs's stdout. */); DEFVAR_LISP ("emacs-iconified", &Vemacs_iconified, - doc: /* Non-nil if all of emacs is iconified and frame updates are not needed. */); + doc: /* Non-nil if all of Emacs is iconified and frame updates are not needed. */); Vemacs_iconified = Qnil; DEFVAR_LISP ("mouse-position-function", &Vmouse_position_function,