diff src/emacs.c @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 78f53ef88e17
children d44af0c54775
line wrap: on
line diff
--- a/src/emacs.c	Mon Aug 13 10:06:48 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:07:35 2007 +0200
@@ -625,9 +625,7 @@
 
   /* Partially handle the -version and -help switches: they imply -batch,
      but are not removed from the list. */
-  if (argmatch (argv, argc, "-help", "--help",   3, NULL, &skip_args) ||
-      argmatch (argv, argc, "-?",     0,         2, NULL, &skip_args) ||
-      argmatch (argv, argc, "-flags", "--flags", 6, NULL, &skip_args))
+  if (argmatch (argv, argc, "-help", "--help",   3, NULL, &skip_args))
     noninteractive = 1, skip_args--;
 
   if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args) ||
@@ -1510,9 +1508,6 @@
   { "-nw", "--no-windows", 90, 0 },
   { "-batch", "--batch", 85, 0 },
   { "-help", "--help", 80, 0 },
-  { "-flags", "--flags", 80, 0 },
-  { "-h", 0, 80, 0 },
-  { "-?", 0, 80, 0 },
   { "-version", "--version", 75, 0 },
   { "-V", 0, 75, 0 },
   { "-d", "--display", 80, 1 },