(main): Delete duplicate code for -version.

(standard_args): Add -help and -version.

diff --git a/src/emacs.c b/src/emacs.c
index 5f5251c238dfec755ad0e8a32c69d0b77cd59cdc..686a784e10cc044453c7877ef182d72c7a91978d 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -927,16 +927,6 @@ Usage: %s [-t term] [--terminal term]  [-nw] [--no-windows]  [--batch]\n\
   tzset ();
 #endif /* defined (sun) || defined (LOCALTIME_CACHE) */
 
-  /* Handle the GNU standard option --version.  */
-  if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args))
-    {
-      Lisp_Object ver;
-      ver = call0 (intern ("emacs-version"));
-      if (STRINGP (ver))
-       printf ("%s\n", XSTRING (ver)->data);
-      exit (0);
-    }
-
   /* Enter editor command loop.  This never returns.  */
   Frecursive_edit ();
   /* NOTREACHED */
@@ -957,6 +947,8 @@ struct standard_args
 
 struct standard_args standard_args[] =
 {
+  { "-version", "--version", 110, 0 },
+  { "-help", "--help", 110, 0 },
   { "-nl", "--no-shared-memory", 100, 0 },
 #ifdef VMS
   { "-map", "--map-data", 100, 0 },