[svn] Restore old behavior of -Y.

diff --git a/src/ChangeLog b/src/ChangeLog
index 992558ad623bc79e9f0bf76ca42d20967392f82b..2b41b878f2ff4bf49a5dcb7a1fe0ae55d2e44f85 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * main.c (option_data): Don't treat -Y as a boolean switch; treat
+       it as a value switch instead, so "-Y off" continues to work.
+
 2005-04-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * utils.c (aprintf): Delete unreachable statement.

diff --git a/src/main.c b/src/main.c
index 4d2163abfca5fd96e1f637c770c6457b594b5496..c91846c90dc9552fa8164d891f4fad544bc2da4d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -218,7 +218,8 @@ struct cmdline_option option_data[] =
     { "preserve-permissions", 0, OPT_BOOLEAN, "preservepermissions", -1 },
     { "progress", 0, OPT_VALUE, "progress", -1 },
     { "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 },
-    { "proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
+    { "proxy", 0, OPT_BOOLEAN, "useproxy", -1 },
+    { "_proxy-compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */
     { "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -1 },
     { "proxy-user", 0, OPT_VALUE, "proxyuser", -1 },
     { "quiet", 'q', OPT_BOOLEAN, "quiet", -1 },