aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog9
-rw-r--r--fm.h3
-rw-r--r--main.c4
-rw-r--r--rc.c6
4 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index dcdf616..93c68ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-15 Rin Okuyama <okuyama@cna.ne.jp>
+
+ * [w3m-dev 02659] rc.c (show_srch_str)
+ * fm.h (show_srch_str): added
+ * main.c (srch_nxtprv): check show_srch_str
+ * rc.c (CMT_SHOW_SRCH_STR): added
+
2001-12-15 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02657]
@@ -1237,4 +1244,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.127 2001/12/14 17:13:13 ukai Exp $
+$Id: ChangeLog,v 1.128 2001/12/14 17:35:08 ukai Exp $
diff --git a/fm.h b/fm.h
index 1f6a1d2..2754555 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.28 2001/12/10 17:02:44 ukai Exp $ */
+/* $Id: fm.h,v 1.29 2001/12/14 17:35:08 ukai Exp $ */
/*
* w3m: WWW wo Miru utility
*
@@ -725,6 +725,7 @@ global int nextpage_topline init(FALSE);
global int displayLink init(FALSE);
global int retryAsHttp init(TRUE);
global int showLineNum init(FALSE);
+global int show_srch_str init(TRUE);
global char *Editor init(DEF_EDITOR);
global char *Mailer init(DEF_MAILER);
global char *ExtBrowser init(DEF_EXT_BROWSER);
diff --git a/main.c b/main.c
index e30e42f..9dd280b 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.35 2001/12/14 17:13:13 ukai Exp $ */
+/* $Id: main.c,v 1.36 2001/12/14 17:35:08 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1322,7 +1322,7 @@ srch_nxtprv(volatile int reverse)
if (wrapped) {
disp_message("Search wrapped", FALSE);
}
- else {
+ else if (show_srch_str) {
disp_message(Sprintf("%s%s",
routine[reverse] ==
forwardSearch ? "Forward: " : "Backward: ",
diff --git a/rc.c b/rc.c
index 524d4c1..d1a0468 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.22 2001/11/30 19:59:26 ukai Exp $ */
+/* $Id: rc.c,v 1.23 2001/12/14 17:35:08 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -106,6 +106,7 @@ static char *config_file = NULL;
#define CMT_NEXTPAGE_TOPLINE "次のページに移動する時にカーソルがトップになるようにする"
#endif
#define CMT_SHOW_NUM "行番号を表示する"
+#define CMT_SHOW_SRCH_STR "検索文字列を表示する"
#define CMT_MIMETYPES "利用するmime.types"
#define CMT_MAILCAP "利用するmailcap"
#define CMT_EDITOR "利用するエディタ"
@@ -221,6 +222,7 @@ static char *config_file = NULL;
#define CMT_NEXTPAGE_TOPLINE "move cursor to top line when moving to next page"
#endif
#define CMT_SHOW_NUM "Show line number"
+#define CMT_SHOW_SRCH_STR "Show search strings"
#define CMT_MIMETYPES "mime.types files"
#define CMT_MAILCAP "mailcap files"
#define CMT_EDITOR "Editor"
@@ -393,6 +395,8 @@ struct param_ptr params1[] = {
{"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject,
CMT_VIEW_UNSEENOBJECTS, NULL},
{"show_lnum", P_INT, PI_ONOFF, (void *)&showLineNum, CMT_SHOW_NUM, NULL},
+ {"show_srch_str", P_INT, PI_ONOFF, (void *)&show_srch_str,
+ CMT_SHOW_SRCH_STR, NULL},
{NULL, 0, 0, NULL, NULL, NULL},
};