summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-04-30 23:50:15 +0000
committerRichard M. Stallman <rms@gnu.org>1995-04-30 23:50:15 +0000
commit9af119282fedc9b77a250c598da777f622b438dc (patch)
tree43e9859563e8885743d85a352691a77de673f5a0 /src/emacs.c
parent039aad8e17ae45b56b95311c005fe8a4ffc83c03 (diff)
downloademacs-9af119282fedc9b77a250c598da777f622b438dc.tar.gz
(main): Delete duplicate code for -version.
(standard_args): Add -help and -version.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 5f5251c238d..686a784e10c 100644
--- 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 },