comparison src/emacs.c @ 83263:1f334cdd7020

Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-142 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-143 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-144 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-145 (make-text-button): Default button type if not specified * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146 quick-install-emacs: Use mkdir --verbose only when requested * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-147 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-148 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-149 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-150 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-151 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152 Add info/dir to arch branch * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-153 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-154 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-155 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-156 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-157 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-158 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-34 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-35 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-36 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-303
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 06 Mar 2005 13:31:20 +0000
parents 9684495d72bc e8bfc9ca45c2
children 1830bcd0eec0
comparison
equal deleted inserted replaced
83262:92c8be21e2c3 83263:1f334cdd7020
249 \n\ 249 \n\
250 Run Emacs, the extensible, customizable, self-documenting real-time\n\ 250 Run Emacs, the extensible, customizable, self-documenting real-time\n\
251 display editor. The recommended way to start Emacs for normal editing\n\ 251 display editor. The recommended way to start Emacs for normal editing\n\
252 is with no options at all.\n\ 252 is with no options at all.\n\
253 \n\ 253 \n\
254 Run M-x info RET m emacs RET m command arguments RET inside Emacs to\n\ 254 Run M-x info RET m emacs RET m emacs invocation RET inside Emacs to\n\
255 read the main documentation for these command-line arguments.\n\ 255 read the main documentation for these command-line arguments.\n\
256 \n\ 256 \n\
257 Initialization options:\n\ 257 Initialization options:\n\
258 \n\ 258 \n\
259 --batch do not do interactive display; implies -q\n\ 259 --batch do not do interactive display; implies -q\n\
295 Display options:\n\ 295 Display options:\n\
296 \n\ 296 \n\
297 --background-color, -bg COLOR window background color\n\ 297 --background-color, -bg COLOR window background color\n\
298 --border-color, -bd COLOR main border color\n\ 298 --border-color, -bd COLOR main border color\n\
299 --border-width, -bw WIDTH width of main border\n\ 299 --border-width, -bw WIDTH width of main border\n\
300 --color MODE color mode for character terminals;\n\ 300 --color, --color=MODE color mode for character terminals;\n\
301 MODE defaults to `auto', and can also\n\ 301 MODE defaults to `auto', and can also\n\
302 be `never', `auto', `always',\n\ 302 be `never', `auto', `always',\n\
303 or a mode name like `ansi8'\n\ 303 or a mode name like `ansi8'\n\
304 --cursor-color, -cr COLOR color of the Emacs cursor indicating point\n\ 304 --cursor-color, -cr COLOR color of the Emacs cursor indicating point\n\
305 --font, -fn FONT default font; must be fixed-width\n\ 305 --font, -fn FONT default font; must be fixed-width\n\
312 --iconic start Emacs in iconified state\n\ 312 --iconic start Emacs in iconified state\n\
313 --internal-border, -ib WIDTH width between text and main border\n\ 313 --internal-border, -ib WIDTH width between text and main border\n\
314 --line-spacing, -lsp PIXELS additional space to put between lines\n\ 314 --line-spacing, -lsp PIXELS additional space to put between lines\n\
315 --mouse-color, -ms COLOR mouse cursor color in Emacs window\n\ 315 --mouse-color, -ms COLOR mouse cursor color in Emacs window\n\
316 --name NAME title for initial Emacs frame\n\ 316 --name NAME title for initial Emacs frame\n\
317 --no-blinking-cursor, -nbc disable blinking cursor\n\
317 --reverse-video, -r, -rv switch foreground and background\n\ 318 --reverse-video, -r, -rv switch foreground and background\n\
318 --title, -T TITLE title for initial Emacs frame\n\ 319 --title, -T TITLE title for initial Emacs frame\n\
319 --vertical-scroll-bars, -vb enable vertical scroll bars\n\ 320 --vertical-scroll-bars, -vb enable vertical scroll bars\n\
320 --xrm XRESOURCES set additional X resources\n\ 321 --xrm XRESOURCES set additional X resources\n\
321 --help display this help and exit\n\ 322 --help display this help and exit\n\
1481 /* Initialize environment from registry settings. */ 1482 /* Initialize environment from registry settings. */
1482 init_environment (argv); 1483 init_environment (argv);
1483 init_ntproc (); /* must precede init_editfns. */ 1484 init_ntproc (); /* must precede init_editfns. */
1484 #endif 1485 #endif
1485 1486
1486 #ifdef HAVE_CARBON 1487 #if defined (MAC_OSX) && defined (HAVE_CARBON)
1487 if (initialized) 1488 if (initialized)
1488 init_mac_osx_environment (); 1489 init_mac_osx_environment ();
1489 #endif 1490 #endif
1490 1491
1491 /* egetenv is a pretty low-level facility, which may get called in 1492 /* egetenv is a pretty low-level facility, which may get called in
1625 syms_of_w32select (); 1626 syms_of_w32select ();
1626 syms_of_w32menu (); 1627 syms_of_w32menu ();
1627 syms_of_fontset (); 1628 syms_of_fontset ();
1628 #endif /* HAVE_NTGUI */ 1629 #endif /* HAVE_NTGUI */
1629 1630
1630 #ifdef HAVE_CARBON 1631 #if defined (MAC_OSX) && defined (HAVE_CARBON)
1631 syms_of_macterm (); 1632 syms_of_macterm ();
1632 syms_of_macfns (); 1633 syms_of_macfns ();
1633 syms_of_macmenu (); 1634 syms_of_macmenu ();
1634 syms_of_fontset (); 1635 syms_of_fontset ();
1635 #endif /* HAVE_CARBON */ 1636 #endif /* MAC_OSX && HAVE_CARBON */
1636 1637
1637 #ifdef SYMS_SYSTEM 1638 #ifdef SYMS_SYSTEM
1638 SYMS_SYSTEM; 1639 SYMS_SYSTEM;
1639 #endif 1640 #endif
1640 1641
1822 { "-bd", "--border-color", 10, 1 }, 1823 { "-bd", "--border-color", 10, 1 },
1823 { "-bw", "--border-width", 10, 1 }, 1824 { "-bw", "--border-width", 10, 1 },
1824 { "-ib", "--internal-border", 10, 1 }, 1825 { "-ib", "--internal-border", 10, 1 },
1825 { "-ms", "--mouse-color", 10, 1 }, 1826 { "-ms", "--mouse-color", 10, 1 },
1826 { "-cr", "--cursor-color", 10, 1 }, 1827 { "-cr", "--cursor-color", 10, 1 },
1828 { "-nbc", "--no-blinking-cursor", 10, 0 },
1827 { "-fn", "--font", 10, 1 }, 1829 { "-fn", "--font", 10, 1 },
1828 { "-font", 0, 10, 1 }, 1830 { "-font", 0, 10, 1 },
1829 { "-fs", "--fullscreen", 10, 0 }, 1831 { "-fs", "--fullscreen", 10, 0 },
1830 { "-fw", "--fullwidth", 10, 0 }, 1832 { "-fw", "--fullwidth", 10, 0 },
1831 { "-fh", "--fullheight", 10, 0 }, 1833 { "-fh", "--fullheight", 10, 0 },
2050 kill it because we are exiting Emacs deliberately (not crashing). 2052 kill it because we are exiting Emacs deliberately (not crashing).
2051 Do it after shut_down_emacs, which does an auto-save. */ 2053 Do it after shut_down_emacs, which does an auto-save. */
2052 if (STRINGP (Vauto_save_list_file_name)) 2054 if (STRINGP (Vauto_save_list_file_name))
2053 unlink (SDATA (Vauto_save_list_file_name)); 2055 unlink (SDATA (Vauto_save_list_file_name));
2054 2056
2055 exit (INTEGERP (arg) ? XINT (arg) 2057 exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
2056 #ifdef VMS
2057 : 1
2058 #else
2059 : 0
2060 #endif
2061 );
2062 /* NOTREACHED */ 2058 /* NOTREACHED */
2059 return 0;
2063 } 2060 }
2064 2061
2065 2062
2066 /* Perform an orderly shutdown of Emacs. Autosave any modified 2063 /* Perform an orderly shutdown of Emacs. Autosave any modified
2067 buffers, kill any child processes, clean up the terminal modes (if 2064 buffers, kill any child processes, clean up the terminal modes (if