fix search problem on different charset page than display charset

* proto.h (conv_search_string): added
* search.c (migemostr): use conv_search_string
	(conv_search_string): added
* main.c (srchcore): use conv_search_string
	(reMark): ditto
* menu.c (menu_search_forward): ditto
	(menu_search_backward): ditto
	(menu_search_next_previous): ditto
From: Fumitoshi UKAI  <ukai@debian.or.jp>

1 files changed, 3 insertions, 13 deletions

diff --git a/main.c b/main.c
index 530ec9f..e874b65 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.240 2004/03/22 17:12:33 ukai Exp $ */
+/* $Id: main.c,v 1.241 2004/03/23 16:44:02 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -1604,13 +1604,7 @@ srchcore(char *volatile str, int (*func) (Buffer *, char *))
     if (SearchString == NULL || *SearchString == '\0')
 	return SR_NOTFOUND;
 
-#ifdef USE_M17N
-    if (SearchConv && !WcOption.pre_conv &&
-	Currentbuf->document_charset != DisplayCharset)
-	str = wtf_conv_fit(str, Currentbuf->document_charset);
-    else
-#endif
-	str = SearchString;
+    str = conv_search_string(SearchString, DisplayCharset);
     prevtrap = mySignal(SIGINT, intTrap);
     crmode();
     if (SETJMP(IntReturn) == 0) {
@@ -2707,11 +2701,7 @@ DEFUN(reMark, REG_MARK, "Set mark using regexp")
 	    return;
 	}
     }
-#ifdef USE_M17N
-    if (SearchConv && !WcOption.pre_conv &&
-	Currentbuf->document_charset != DisplayCharset)
-	str = wtf_conv_fit(str, Currentbuf->document_charset);
-#endif
+    str = conv_search_string(str, DisplayCharset);
     if ((str = regexCompile(str, 1)) != NULL) {
 	disp_message(str, TRUE);
 	return;