From 43134cdfa88f1092c18dea3095adac7a5944cf7a Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sat, 3 Mar 2018 19:19:06 +0530 Subject: [PATCH] Support ~, - and & keyboard shortcuts at the bookmark prompt. In nav-as-you-type mode only control keys are understood when filter is enabled. We need some way to quicly jump HOME, last visited dir or start dir. --- README.md | 2 ++ nnn.1 | 1 + nnn.c | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ddce609..105481a6 100644 --- a/README.md +++ b/README.md @@ -340,6 +340,8 @@ Set environment variable `NNN_BMS` as a string of `key:location` pairs (max 10) export NNN_BMS='doc:~/Documents;u:/home/user/Cam Uploads;D:~/Downloads/' +The bookmark prompt also understands the ~ (HOME), - (last visited directory) and & (start directory) shortcuts. + #### use cd ..... To jump to the nth level parent, with PWD at level 0, use `n + 1` dots. For example, to jump to the 6 parent of the current directory, use 7 dots. If the number of dots would take you *beyond* `/` (which isn't possible), you'll be placed at `/`. diff --git a/nnn.1 b/nnn.1 index 72cf97f4..533f70dd 100644 --- a/nnn.1 +++ b/nnn.1 @@ -220,6 +220,7 @@ when dealing with the !, e and p commands respectively. .Bd -literal export NNN_BMS='doc:~/Documents;u:/home/user/Cam Uploads;D:~/Downloads/' .Ed +The bookmark prompt also understands the \fI~\fR (HOME), \fI-\fR (last visited directory) and \fI&\fR shortcuts. .Pp \fBNNN_USE_EDITOR:\fR use EDITOR (preferably CLI, fallback vi) to handle text files. diff --git a/nnn.c b/nnn.c index 291c1196..3f186ebc 100644 --- a/nnn.c +++ b/nnn.c @@ -2726,9 +2726,15 @@ nochange: printprompt("key: "); tmp = readinput(); clearprompt(); - if (tmp == NULL) + if (tmp == NULL || tmp[0] == '\0') break; + /* Interpret ~, - and & keys */ + if ((tmp[1] == '\0') && (tmp[0] == '~' || tmp[0] == '-' || tmp[0] == '&')) { + presel = tmp[0]; + goto begin; + } + if (get_bm_loc(tmp, newpath) == NULL) { printmsg(messages[STR_INVBM_ID]); goto nochange;