aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--file.c14
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4695b7d..56b3a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-06-10 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
+ * [w3m-dev-en 00752] Re: tab completion weirdness in w3m 0.3
+ * file.c (doFileCopy): same fix as [w3m-dev-en 00751]
+
+2002-06-10 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
+
* [w3m-dev-en 00751] Re: tab completion weirdness in w3m 0.3
* main.c (svBuf): unescape spaces when input is filename
* proto.h (unescape_spaces): added
@@ -3488,4 +3493,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.387 2002/06/09 16:09:24 ukai Exp $
+$Id: ChangeLog,v 1.388 2002/06/09 16:11:33 ukai Exp $
diff --git a/file.c b/file.c
index 6beb3b6..24b4fea 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.91 2002/05/14 15:31:49 ukai Exp $ */
+/* $Id: file.c,v 1.92 2002/06/09 16:11:33 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -7112,18 +7112,22 @@ doFileCopy(char *tmpf, char *defstr)
{
Str msg;
Str filen;
- char *p, *q;
+ char *p, *q = NULL;
if (fmInitialized) {
p = searchKeyData();
if (p == NULL || *p == '\0') {
- p = inputLineHist("(Download)Save file to: ",
+ q = inputLineHist("(Download)Save file to: ",
defstr, IN_COMMAND, SaveHist);
- if (p == NULL || *p == '\0')
+ if (q == NULL || *q == '\0')
return;
- p = conv_to_system(p);
+ p = conv_to_system(q);
}
if (*p != '|' || !PermitSaveToPipe) {
+ if (q) {
+ p = unescape_spaces(Strnew_charp(q))->ptr;
+ p = conv_to_system(q);
+ }
p = expandName(p);
if (checkOverWrite(p) < 0)
return;