Mercurial > emacs
diff src/emacs.c @ 83301:b151ec53c504
Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-286
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-287
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-288
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-289
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-290
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-291
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-341
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 06 May 2005 21:06:31 +0000 |
| parents | effe22690419 e3167e9f22d0 |
| children | 6fef25c75847 |
line wrap: on
line diff
--- a/src/emacs.c Tue May 03 03:01:09 2005 +0000 +++ b/src/emacs.c Fri May 06 21:06:31 2005 +0000 @@ -324,16 +324,16 @@ --xrm XRESOURCES set additional X resources\n\ --help display this help and exit\n\ --version output version information and exit\n\ -\n\ +\n" + +#define USAGE4 "\ You can generally also specify long option names with a single -; for\n\ example, -batch as well as --batch. You can use any unambiguous\n\ abbreviation for a --option.\n\ \n\ Various environment variables and window system resources also affect\n\ Emacs' operation. See the main documentation.\n\ -\n" - -#define USAGE4 "\ +\n\ Report bugs to %s. First, please see the Bugs\n\ section of the Emacs manual or the file BUGS.\n"