diff options
| author | Karoly Lorentey | 2004-11-13 18:21:48 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-11-13 18:21:48 +0000 |
| commit | f590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (patch) | |
| tree | 0ea1998c7a87cdc3faa9d00d3ea71b981cc1153a /src/frame.c | |
| parent | 050ddd28da8d0bb44f06575e93c6bd7feb758829 (diff) | |
| parent | c37ee7cb84b11bf38e1f391b2015a2ec74e5c4e1 (diff) | |
| download | emacs-f590a2a442d19f3a74d7bbd02bbcb4e3239f2327.tar.gz emacs-f590a2a442d19f3a74d7bbd02bbcb4e3239f2327.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-672
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-266
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 1935df35508..80d1876ef11 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -4285,7 +4285,7 @@ is a reasonable practice. See also the variable `x-resource-name'. */); | |||
| 4285 | DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist, | 4285 | DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist, |
| 4286 | doc: /* Alist of default values for frame creation. | 4286 | doc: /* Alist of default values for frame creation. |
| 4287 | These may be set in your init file, like this: | 4287 | These may be set in your init file, like this: |
| 4288 | (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1)) | 4288 | (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1))) |
| 4289 | These override values given in window system configuration data, | 4289 | These override values given in window system configuration data, |
| 4290 | including X Windows' defaults database. | 4290 | including X Windows' defaults database. |
| 4291 | For values specific to the first Emacs frame, see `initial-frame-alist'. | 4291 | For values specific to the first Emacs frame, see `initial-frame-alist'. |