Remove support for the name 'vpatch'

Apparently it is otherwise used:
   http://www.tibed.net/index.php?page=vpatch

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/ReadMe.c b/ReadMe.c
index 92ceaa5879087d2a3c6ebf088fdd2939096b53fd..7ae6e20553e39e683ff6a0c95e6b23dfd0d91d27 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -73,7 +73,7 @@ char Help[] =  "\n"
 "   --extract   -x    : select 'extract' function.\n"
 "   --diff      -d    : select 'diff' function.\n"
 "   --merge     -m    : select 'merge' function (default).\n"
-"   --browse    -B    : select 'browse' function - default if program is 'vpatch'.\n"
+"   --browse    -B    : select 'browse' function.\n"
 "\n"
 "   --words     -w    : word-wise diff and merge.\n"
 "   --lines     -l    : line-wise diff and merge.\n"
@@ -152,7 +152,6 @@ char HelpMerge[] = "\n"
 
 char HelpBrowse[] = "\n"
 "wiggle --browse [-R] [--strip=n] multi-file-patch\n"
-"vpatch  [-R] [--strip=n] multi-file-patch\n"
 "\n"
 "The 'browse' function provides an interactive mode for browsing a\n"
 "set of patches.  It allows the application of a patch to each file \n"

diff --git a/wiggle.c b/wiggle.c
index b2e019e0026ab644eff9a559d1f53f9712d35ad7..8e9373656cc08ce636f865fb29fe40a68a2470cd 100644 (file)
--- a/wiggle.c
+++ b/wiggle.c
@@ -167,11 +167,13 @@ int main(int argc, char *argv[])
 
        base0 = strrchr(argv[0], '/');
        if (base0) base0++; else base0=argv[0];
+#if 0
+       /* The name 'vpatch' seems to be used elsewhere */
        if (strcmp(base0, "vpatch")==0) {
                Cmd = base0;
                mode = 'B';
        }
-
+#endif
        while ((opt = getopt_long(argc, argv,
                                  short_options(mode), long_options,
                                  &option_index)) != -1)