Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
83300:6deb860255f3 | 83301:b151ec53c504 |
---|---|
322 --title, -T TITLE title for initial Emacs frame\n\ | 322 --title, -T TITLE title for initial Emacs frame\n\ |
323 --vertical-scroll-bars, -vb enable vertical scroll bars\n\ | 323 --vertical-scroll-bars, -vb enable vertical scroll bars\n\ |
324 --xrm XRESOURCES set additional X resources\n\ | 324 --xrm XRESOURCES set additional X resources\n\ |
325 --help display this help and exit\n\ | 325 --help display this help and exit\n\ |
326 --version output version information and exit\n\ | 326 --version output version information and exit\n\ |
327 \n\ | 327 \n" |
328 | |
329 #define USAGE4 "\ | |
328 You can generally also specify long option names with a single -; for\n\ | 330 You can generally also specify long option names with a single -; for\n\ |
329 example, -batch as well as --batch. You can use any unambiguous\n\ | 331 example, -batch as well as --batch. You can use any unambiguous\n\ |
330 abbreviation for a --option.\n\ | 332 abbreviation for a --option.\n\ |
331 \n\ | 333 \n\ |
332 Various environment variables and window system resources also affect\n\ | 334 Various environment variables and window system resources also affect\n\ |
333 Emacs' operation. See the main documentation.\n\ | 335 Emacs' operation. See the main documentation.\n\ |
334 \n" | 336 \n\ |
335 | |
336 #define USAGE4 "\ | |
337 Report bugs to %s. First, please see the Bugs\n\ | 337 Report bugs to %s. First, please see the Bugs\n\ |
338 section of the Emacs manual or the file BUGS.\n" | 338 section of the Emacs manual or the file BUGS.\n" |
339 | 339 |
340 | 340 |
341 /* Signal code for the fatal signal that was received. */ | 341 /* Signal code for the fatal signal that was received. */ |