From 2130e1b33aba3667249a3630db880963c9492ba3 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 15 Jun 2022 19:48:11 +0530 Subject: [PATCH] Use the term auto-advance instead of auto-jump There's no jump. --- README.md | 2 +- misc/auto-completion/fish/nnn.fish | 2 +- misc/auto-completion/zsh/_nnn | 2 +- nnn.1 | 2 +- patches/gitstatus/mainline.diff | 2 +- patches/gitstatus/namefirst.diff | 2 +- patches/restorepreview/mainline.diff | 2 +- src/nnn.c | 8 ++++---- src/nnn.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 412c26b7..00ab86b8 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Runs on the Pi, [Termux](https://www.youtube.com/embed/AbaauM7gUJw) (Android), L - Remote mounts (needs `sshfs`, `rclone`) - Familiar shortcuts (arrows, ~, -, @), quick look-up - `cd` on quit (*easy* shell integration) - - Jump to next file on file open and selection + - Proceed to next file on file open and selection - Search - Instant filtering with *search-as-you-type* - Regex (POSIX/PCRE) and string (default) filters diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish index 05f92ae2..c3dc6e79 100644 --- a/misc/auto-completion/fish/nnn.fish +++ b/misc/auto-completion/fish/nnn.fish @@ -24,7 +24,7 @@ complete -c nnn -s f -d 'use readline history file' complete -c nnn -s g -d 'regex filters' complete -c nnn -s H -d 'show hidden files' complete -c nnn -s i -d 'show current file info' -complete -c nnn -s J -d 'no auto-jump on select' +complete -c nnn -s J -d 'no auto-advance on selection' complete -c nnn -s K -d 'detect key collision' complete -c nnn -s l -r -d 'lines to move per scroll' complete -c nnn -s n -d 'start in type-to-nav mode' diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn index 8de4bdfe..293fd4fb 100644 --- a/misc/auto-completion/zsh/_nnn +++ b/misc/auto-completion/zsh/_nnn @@ -22,7 +22,7 @@ args=( '(-g)-g[regex filters]' '(-H)-H[show hidden files]' '(-i)-i[show current file info]' - '(-J)-J[no auto-jump on select]' + '(-J)-J[no auto-advance on selection]' '(-K)-K[detect key collision]' '(-l)-l[lines to move per scroll]:val' '(-n)-n[start in type-to-nav mode]' diff --git a/nnn.1 b/nnn.1 index 9a9b37a4..954d036b 100644 --- a/nnn.1 +++ b/nnn.1 @@ -88,7 +88,7 @@ supports the following options: show current file information in info bar (may be slow) .Pp .Fl J - disable auto-jump on selection + disable auto-advance on selection (eg. selecting an entry will no longer move cursor to the next entry) .Pp .Fl K diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff index 07fc3e90..bb7bdc07 100644 --- a/patches/gitstatus/mainline.diff +++ b/patches/gitstatus/mainline.diff @@ -210,7 +210,7 @@ index 508ee915..77d56d63 100644 + " -G always show git status\n" " -H show hidden files\n" " -i show current file info\n" - " -J no auto-jump on selection\n" + " -J no auto-advance on selection\n" @@ -8282,6 +8398,7 @@ static void cleanup(void) fflush(stdout); } diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff index 4dacfb80..00173af9 100644 --- a/patches/gitstatus/namefirst.diff +++ b/patches/gitstatus/namefirst.diff @@ -213,7 +213,7 @@ index ee1f5beb..91aab231 100644 + " -G always show git status\n" " -H show hidden files\n" " -i show current file info\n" - " -J no auto-jump on selection\n" + " -J no auto-advance on selection\n" @@ -8292,6 +8407,7 @@ static void cleanup(void) fflush(stdout); } diff --git a/patches/restorepreview/mainline.diff b/patches/restorepreview/mainline.diff index ecac37de..a020e748 100644 --- a/patches/restorepreview/mainline.diff +++ b/patches/restorepreview/mainline.diff @@ -11,7 +11,7 @@ index 6b0c1dc5..2aac557b 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -372,7 +372,8 @@ typedef struct { - uint_t stayonsel : 1; /* Disable auto-jump on select */ + uint_t stayonsel : 1; /* Disable auto-advance on selection */ uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */ uint_t uidgid : 1; /* Show owner and group info */ - uint_t reserved : 6; /* Adjust when adding/removing a field */ diff --git a/src/nnn.c b/src/nnn.c index eb7d6e59..8b0db0df 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -350,7 +350,7 @@ typedef struct { /* Non-persistent program-internal states (alphabeical order) */ typedef struct { uint_t autofifo : 1; /* Auto-create NNN_FIFO */ - uint_t autonext : 1; /* Auto-jump on open */ + uint_t autonext : 1; /* Auto-advance on file open */ uint_t dircolor : 1; /* Current status of dir color */ uint_t dirctx : 1; /* Show dirs in context color */ uint_t duinit : 1; /* Initialize disk usage */ @@ -369,7 +369,7 @@ typedef struct { uint_t runplugin : 1; /* Choose plugin mode */ uint_t selbm : 1; /* Select a bookmark from bookmarks directory */ uint_t selmode : 1; /* Set when selecting files */ - uint_t stayonsel : 1; /* Disable auto-jump on select */ + uint_t stayonsel : 1; /* Disable auto-advance on selection */ uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */ uint_t uidgid : 1; /* Show owner and group info */ uint_t reserved : 6; /* Adjust when adding/removing a field */ @@ -5039,7 +5039,7 @@ static void show_help(const char *path) "9Lt h Parent%-12c~ ` @ - ~, /, start, prev\n" "5Ret Rt l Open%-20c' First file/match\n" "9g ^A Top%-21c. Toggle hidden\n" - "9G ^E End%-20c^J Toggle auto-jump on open\n" + "9G ^E End%-20c^J Toggle auto-advance on open\n" "8B (,) Book(mark)%-11cb ^/ Select bookmark\n" "a1-4 Context%-11c(Sh)Tab Cycle/new context\n" "62Esc ^Q Quit%-20cq Quit context\n" @@ -8180,7 +8180,7 @@ static void usage(void) " -g regex filters\n" " -H show hidden files\n" " -i show current file info\n" - " -J no auto-jump on selection\n" + " -J no auto-advance on selection\n" " -K detect key collision\n" " -l val set scroll lines\n" " -n type-to-nav mode\n" diff --git a/src/nnn.h b/src/nnn.h index 5e23cc3d..e603840f 100644 --- a/src/nnn.h +++ b/src/nnn.h @@ -247,7 +247,7 @@ static struct key bindings[] = { { 'u', SEL_UMOUNT }, /* Show help */ { '?', SEL_HELP }, - /* Toggle auto-jump on open */ + /* Toggle auto-advance on file open */ { CONTROL('J'), SEL_AUTONEXT }, /* Edit in EDITOR */ { 'e', SEL_EDIT }, -- 2.48.1