diff src/emacs.c @ 83263:1f334cdd7020

Merged from [e-mail]--gnu-2005 (patch 34-36, 142-158) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-142 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-143 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-144 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-145 (make-text-button): Default button type if not specified * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-146 quick-install-emacs: Use mkdir --verbose only when requested * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-147 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-148 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-149 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-150 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-151 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-152 Add info/dir to arch branch * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-153 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-154 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-155 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-156 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-157 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-158 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-34 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-35 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-36 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-303

--- a/src/emacs.c	Mon Feb 28 15:15:44 2005 +0000
+++ b/src/emacs.c	Sun Mar 06 13:31:20 2005 +0000
@@ -251,7 +251,7 @@
 display editor.  The recommended way to start Emacs for normal editing\n\
 is with no options at all.\n\
 \n\
-Run M-x info RET m emacs RET m command arguments RET inside Emacs to\n\
+Run M-x info RET m emacs RET m emacs invocation RET inside Emacs to\n\
 read the main documentation for these command-line arguments.\n\
 \n\
 Initialization options:\n\
@@ -297,7 +297,7 @@
 --background-color, -bg COLOR   window background color\n\
 --border-color, -bd COLOR       main border color\n\
 --border-width, -bw WIDTH       width of main border\n\
---color MODE                    color mode for character terminals;\n\
+--color, --color=MODE           color mode for character terminals;\n\
                                   MODE defaults to `auto', and can also\n\
                                   be `never', `auto', `always',\n\
                                   or a mode name like `ansi8'\n\
@@ -314,6 +314,7 @@
 --line-spacing, -lsp PIXELS     additional space to put between lines\n\
 --mouse-color, -ms COLOR        mouse cursor color in Emacs window\n\
 --name NAME                     title for initial Emacs frame\n\
+--no-blinking-cursor, -nbc      disable blinking cursor\n\
 --reverse-video, -r, -rv        switch foreground and background\n\
 --title, -T TITLE               title for initial Emacs frame\n\
 --vertical-scroll-bars, -vb     enable vertical scroll bars\n\
@@ -1483,7 +1484,7 @@
   init_ntproc ();	/* must precede init_editfns.  */
 #endif
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
   if (initialized)
     init_mac_osx_environment ();
 #endif
@@ -1627,12 +1628,12 @@
       syms_of_fontset ();
 #endif /* HAVE_NTGUI */
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
       syms_of_macterm ();
       syms_of_macfns ();
       syms_of_macmenu ();
       syms_of_fontset ();
-#endif /* HAVE_CARBON */
+#endif /* MAC_OSX && HAVE_CARBON */
 
 #ifdef SYMS_SYSTEM
       SYMS_SYSTEM;
@@ -1824,6 +1825,7 @@
   { "-ib", "--internal-border", 10, 1 },
   { "-ms", "--mouse-color", 10, 1 },
   { "-cr", "--cursor-color", 10, 1 },
+  { "-nbc", "--no-blinking-cursor", 10, 0 },
   { "-fn", "--font", 10, 1 },
   { "-font", 0, 10, 1 },
   { "-fs", "--fullscreen", 10, 0 },
@@ -2052,14 +2054,9 @@
   if (STRINGP (Vauto_save_list_file_name))
     unlink (SDATA (Vauto_save_list_file_name));
 
-  exit (INTEGERP (arg) ? XINT (arg)
-#ifdef VMS
-	: 1
-#else
-	: 0
-#endif
-	);
+  exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
   /* NOTREACHED */
+  return 0;
 }