Mercurial > emacs
comparison src/emacs.c @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 05 May 2005 00:04:55 +0000 |
parents | 146c086df160 e3167e9f22d0 |
children | f042e7c0fe20 |
comparison
equal
deleted
inserted
replaced
90158:bf4846baba9a | 90159:08185296b491 |
---|---|
262 --no-desktop do not load a saved desktop\n\ | 262 --no-desktop do not load a saved desktop\n\ |
263 --no-init-file, -q load neither ~/.emacs nor default.el\n\ | 263 --no-init-file, -q load neither ~/.emacs nor default.el\n\ |
264 --no-shared-memory, -nl do not use shared memory\n\ | 264 --no-shared-memory, -nl do not use shared memory\n\ |
265 --no-site-file do not load site-start.el\n\ | 265 --no-site-file do not load site-start.el\n\ |
266 --no-splash do not display a splash screen on startup\n\ | 266 --no-splash do not display a splash screen on startup\n\ |
267 --no-window-system, -nw don't communicate with X, ignoring $DISPLAY\n\ | 267 --no-window-system, -nw do not communicate with X, ignoring $DISPLAY\n\ |
268 --quick, -Q equivalent to -q --no-site-file\n\ | |
268 --script FILE run FILE as an Emacs Lisp script\n\ | 269 --script FILE run FILE as an Emacs Lisp script\n\ |
269 --terminal, -t DEVICE use DEVICE for terminal I/O\n\ | 270 --terminal, -t DEVICE use DEVICE for terminal I/O\n\ |
270 --unibyte, --no-multibyte run Emacs in unibyte mode\n\ | 271 --unibyte, --no-multibyte run Emacs in unibyte mode\n\ |
271 --user, -u USER load ~USER/.emacs instead of your own\n\ | 272 --user, -u USER load ~USER/.emacs instead of your own\n\ |
272 \n%s" | 273 \n%s" |
292 | 293 |
293 #define USAGE3 "\ | 294 #define USAGE3 "\ |
294 Display options:\n\ | 295 Display options:\n\ |
295 \n\ | 296 \n\ |
296 --background-color, -bg COLOR window background color\n\ | 297 --background-color, -bg COLOR window background color\n\ |
298 --basic-display, -D disable many display features;\n\ | |
299 used for debugging Emacs\n\ | |
297 --border-color, -bd COLOR main border color\n\ | 300 --border-color, -bd COLOR main border color\n\ |
298 --border-width, -bw WIDTH width of main border\n\ | 301 --border-width, -bw WIDTH width of main border\n\ |
299 --color, --color=MODE color mode for character terminals;\n\ | 302 --color, --color=MODE color mode for character terminals;\n\ |
300 MODE defaults to `auto', and can also\n\ | 303 MODE defaults to `auto', and can also\n\ |
301 be `never', `auto', `always',\n\ | 304 be `never', `auto', `always',\n\ |
318 --title, -T TITLE title for initial Emacs frame\n\ | 321 --title, -T TITLE title for initial Emacs frame\n\ |
319 --vertical-scroll-bars, -vb enable vertical scroll bars\n\ | 322 --vertical-scroll-bars, -vb enable vertical scroll bars\n\ |
320 --xrm XRESOURCES set additional X resources\n\ | 323 --xrm XRESOURCES set additional X resources\n\ |
321 --help display this help and exit\n\ | 324 --help display this help and exit\n\ |
322 --version output version information and exit\n\ | 325 --version output version information and exit\n\ |
323 \n\ | 326 \n" |
327 | |
328 #define USAGE4 "\ | |
324 You can generally also specify long option names with a single -; for\n\ | 329 You can generally also specify long option names with a single -; for\n\ |
325 example, -batch as well as --batch. You can use any unambiguous\n\ | 330 example, -batch as well as --batch. You can use any unambiguous\n\ |
326 abbreviation for a --option.\n\ | 331 abbreviation for a --option.\n\ |
327 \n\ | 332 \n\ |
328 Various environment variables and window system resources also affect\n\ | 333 Various environment variables and window system resources also affect\n\ |
329 Emacs' operation. See the main documentation.\n\ | 334 Emacs' operation. See the main documentation.\n\ |
330 \n" | 335 \n\ |
331 | |
332 #define USAGE4 "\ | |
333 Report bugs to %s. First, please see the Bugs\n\ | 336 Report bugs to %s. First, please see the Bugs\n\ |
334 section of the Emacs manual or the file BUGS.\n" | 337 section of the Emacs manual or the file BUGS.\n" |
335 | 338 |
336 | 339 |
337 /* Signal code for the fatal signal that was received. */ | 340 /* Signal code for the fatal signal that was received. */ |
1316 syms_of_macfns (); | 1319 syms_of_macfns (); |
1317 syms_of_ccl (); | 1320 syms_of_ccl (); |
1318 syms_of_fontset (); | 1321 syms_of_fontset (); |
1319 syms_of_macterm (); | 1322 syms_of_macterm (); |
1320 syms_of_macmenu (); | 1323 syms_of_macmenu (); |
1324 syms_of_macselect (); | |
1321 syms_of_data (); | 1325 syms_of_data (); |
1322 syms_of_search (); | 1326 syms_of_search (); |
1323 syms_of_frame (); | 1327 syms_of_frame (); |
1324 | 1328 |
1325 mac_term_init (build_string ("Mac"), NULL, NULL); | 1329 mac_term_init (build_string ("Mac"), NULL, NULL); |
1635 | 1639 |
1636 #if defined (MAC_OSX) && defined (HAVE_CARBON) | 1640 #if defined (MAC_OSX) && defined (HAVE_CARBON) |
1637 syms_of_macterm (); | 1641 syms_of_macterm (); |
1638 syms_of_macfns (); | 1642 syms_of_macfns (); |
1639 syms_of_macmenu (); | 1643 syms_of_macmenu (); |
1644 syms_of_macselect (); | |
1640 syms_of_fontset (); | 1645 syms_of_fontset (); |
1641 #endif /* MAC_OSX && HAVE_CARBON */ | 1646 #endif /* MAC_OSX && HAVE_CARBON */ |
1642 | 1647 |
1643 #ifdef SYMS_SYSTEM | 1648 #ifdef SYMS_SYSTEM |
1644 SYMS_SYSTEM; | 1649 SYMS_SYSTEM; |