From 75c54da6ba62daac44dcc04c79a1bdf828e401fb Mon Sep 17 00:00:00 2001 From: bptato Date: Tue, 1 Sep 2020 20:48:04 +0200 Subject: Space is now entered in URL fields instead of triggering file completion, old behavior can be toggled via options --- fm.h | 1 + linein.c | 2 +- rc.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3