[w3m-dev 03196] C-w

* linein.c (inputLineHistSearch) move_word changed
* linein.c (setStrType): add space to termchar
From: Hiroaki Shimotsu <shim@d5.bs1.fc.nec.co.jp>

2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index b324b70..50b1ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-02  Hiroaki Shimotsu <shim@d5.bs1.fc.nec.co.jp>
+
+	* [w3m-dev 03196] C-w
+	* linein.c (inputLineHistSearch) move_word changed
+	* linein.c (setStrType): add space to termchar
+
 2002-05-15  Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
 
 	* [w3m-dev 03191] typo in file.c:extract_auth_val()?
@@ -3412,4 +3418,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.379 2002/05/14 15:31:49 ukai Exp $
+$Id: ChangeLog,v 1.380 2002/06/01 16:31:54 ukai Exp $
diff --git a/linein.c b/linein.c
index 327f9a5..9e70d19 100644
--- a/linein.c
+++ b/linein.c
@@ -1,4 +1,4 @@
-/* $Id: linein.c,v 1.22 2002/01/31 03:55:35 ukai Exp $ */
+/* $Id: linein.c,v 1.23 2002/06/01 16:31:55 ukai Exp $ */
 #include "fm.h"
 #include "local.h"
 #include "myctype.h"
@@ -97,7 +97,7 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist,
     in_kanji = FALSE;
 #endif
     is_passwd = FALSE;
-    move_word = FALSE;
+    move_word = TRUE;
 
     CurrentHist = hist;
     if (hist != NULL) {
@@ -109,15 +109,14 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist,
     }
     if (flag & IN_URL) {
 	cm_mode = CPL_ALWAYS | CPL_URL;
-	move_word = TRUE;
     }
     else if (flag & IN_FILENAME) {
 	cm_mode = CPL_ALWAYS;
-	move_word = TRUE;
     }
     else if (flag & IN_PASSWORD) {
 	cm_mode = CPL_NEVER;
 	is_passwd = TRUE;
+	move_word = FALSE;
     }
     else if (flag & IN_COMMAND)
 	cm_mode = CPL_ON;
@@ -1115,7 +1114,7 @@ setStrType(Str str, Lineprop *prop)
 static int
 terminated(unsigned char c)
 {
-    int termchar[] = { '/', '&', '?', -1 };
+    int termchar[] = { '/', '&', '?', ' ', -1 };
     int *tp;
 
     for (tp = termchar; *tp > 0; tp++) {