aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2020-09-02 11:26:17 +0000
committerGitHub <noreply@github.com>2020-09-02 11:26:17 +0000
commit0a7c4b6be7eeaa042852cd97597e299c7a494ce4 (patch)
treea1963a97715b8b7ad5f1861a2da24cc6d94a2b17
parentUpdate ChangeLog (diff)
parentSpace is now entered in URL fields instead of triggering file completion, old... (diff)
downloadw3m-0a7c4b6be7eeaa042852cd97597e299c7a494ce4.tar.gz
w3m-0a7c4b6be7eeaa042852cd97597e299c7a494ce4.zip
Merge pull request #149 from bptato/master
Allow spaces to be entered in URL fields
Diffstat (limited to '')
-rw-r--r--fm.h1
-rw-r--r--linein.c2
-rw-r--r--rc.c3
3 files changed, 5 insertions, 1 deletions
diff --git a/fm.h b/fm.h
index e536e51..0cd8235 100644
--- a/fm.h
+++ b/fm.h
@@ -961,6 +961,7 @@ global int confirm_on_quit init(TRUE);
global int use_mark init(FALSE);
#endif
global int emacs_like_lineedit init(FALSE);
+global int space_autocomplete init(FALSE);
global int vi_prec_num init(FALSE);
global int label_topline init(FALSE);
global int nextpage_topline init(FALSE);
diff --git a/linein.c b/linein.c
index d8f9023..5800271 100644
--- a/linein.c
+++ b/linein.c
@@ -184,7 +184,7 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist,
cm_clear = TRUE;
cm_disp_clear = TRUE;
if (!i_quote &&
- (((cm_mode & CPL_ALWAYS) && (c == CTRL_I || c == ' ')) ||
+ (((cm_mode & CPL_ALWAYS) && (c == CTRL_I || (space_autocomplete && c == ' ')) ||
((cm_mode & CPL_ON) && (c == CTRL_I)))) {
if (emacs_like_lineedit && cm_next) {
_dcompl();
diff --git a/rc.c b/rc.c
index a44c5c8..423e008 100644
--- a/rc.c
+++ b/rc.c
@@ -131,6 +131,7 @@ static int OptionEncode = FALSE;
#define CMT_USE_MARK N_("Enable mark operations")
#endif
#define CMT_EMACS_LIKE_LINEEDIT N_("Enable Emacs-style line editing")
+#define CMT_SPACE_AUTOCOMPLETE N_("Space key triggers file completion while editing URLs")
#define CMT_VI_PREC_NUM N_("Enable vi-like numeric prefix")
#define CMT_LABEL_TOPLINE N_("Move cursor to top line when going to label")
#define CMT_NEXTPAGE_TOPLINE N_("Move cursor to top line when moving to next page")
@@ -485,6 +486,8 @@ struct param_ptr params3[] = {
#endif
{"emacs_like_lineedit", P_INT, PI_ONOFF, (void *)&emacs_like_lineedit,
CMT_EMACS_LIKE_LINEEDIT, NULL},
+ {"space_autocomplete", P_INT, PI_ONOFF, (void *)&space_autocomplete,
+ CMT_SPACE_AUTOCOMPLETE, NULL},
{"vi_prec_num", P_INT, PI_ONOFF, (void *)&vi_prec_num, CMT_VI_PREC_NUM,
NULL},
{"mark_all_pages", P_INT, PI_ONOFF, (void *)&MarkAllPages,