diff --git a/README.md b/README.md index 3cc7dadf..6b1c3b25 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ It runs on Linux, macOS, Raspberry Pi, BSD, Cygwin, Linux subsystem for Windows - Contexts (_aka_ tabs _aka_ workspaces) - *Navigate-as-you-type* with auto-select directory - Bookmarks - - Familiar, easy shortcuts (arrows, `~`, `-`, `&`) + - Familiar, easy shortcuts (arrows, `~`, `-`, `@`) - Pin and visit a directory - Sorting - Directories always listed on top @@ -196,7 +196,7 @@ Option completion scripts for Bash, Fish and Zsh can be found in respective subd #### Cmdline options ``` -usage: nnn [-b key] [-C] [-e] [-i] [-l] [-n] +usage: nnn [-b key] [-d] [-e] [-i] [-l] [-n] [-p file] [-s] [-S] [-v] [-w] [-h] [PATH] The missing terminal file manager for X. @@ -228,7 +228,7 @@ Press ? in `nnn` to see the list anytime. ↑ k Up PgUp ^U Scroll up ↓ j Down PgDn ^D Scroll down ← h Parent dir ~ Go HOME - ↵ → l Open file/dir & Start dir + ↵ → l Open file/dir @ Start dir Home g ^A First entry - Last visited dir End G ^E Last entry . Toggle show hidden / Filter Ins ^T Toggle nav-as-you-type @@ -271,7 +271,7 @@ The Leader key (` or ^/) provides a powerful multi-functio | key | Go to bookmarked location | | ~ | Go to HOME directory | | - | Go to last visited directory | -| & | Go to start directory | +| @ | Go to start directory | | q | Quit context | #### Contexts diff --git a/src/nnn.c b/src/nnn.c index b5b4e080..0e393429 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -2361,7 +2361,7 @@ static bool show_help(const char *path) "a↑ k Up PgUp ^U Scroll up\n" "a↓ j Down PgDn ^D Scroll down\n" "a← h Parent dir ~ Go HOME\n" - "8↵ → l Open file/dir & Start dir\n" + "8↵ → l Open file/dir @ Start dir\n" "4Home g ^A First entry - Last visited dir\n" "5End G ^E Last entry . Toggle show hidden\n" "c/ Filter Ins ^T Toggle nav-as-you-type\n" @@ -3130,7 +3130,7 @@ nochange: case 'q': // fallthrough case '~': // fallthrough case '-': // fallthrough - case '&': + case '@': presel = fd; goto nochange; case '>': // fallthrough diff --git a/src/nnn.h b/src/nnn.h index dadbde6f..3c4b909f 100644 --- a/src/nnn.h +++ b/src/nnn.h @@ -138,7 +138,7 @@ static struct key bindings[] = { /* HOME */ { '~', SEL_CDHOME }, /* Initial directory */ - { '&', SEL_CDBEGIN }, + { '@', SEL_CDBEGIN }, /* Last visited dir */ { '-', SEL_CDLAST }, /* Visit marked directory */