diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /doc/man/emacs.1.in | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.bz2 emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip | |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'doc/man/emacs.1.in')
| -rw-r--r-- | doc/man/emacs.1.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index e332fb45c7b..11a3390b17e 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -279,8 +279,8 @@ window's width, height, and position as specified. The geometry specification is in the standard X format; see .BR X (7) for more information. -The width and height are specified in characters; the default is -80 by 24. +The width and height are specified in characters; the default for GUI +frames is 80 by 36. See the Emacs manual, section "Options for Window Size and Position", for information on how window sizes interact with selecting or deselecting the tool bar and menu bar. @@ -653,7 +653,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. . . .SH COPYING -Copyright 1995, 1999-2018 Free Software Foundation, Inc. +Copyright 1995, 1999-2019 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are |