Option n - nav as you type, V - version sort

diff --git a/misc/auto-completion/bash/nnn-completion.bash b/misc/auto-completion/bash/nnn-completion.bash
index 22da4af37948063afd45cf870c50997615fc38f4..86102bd4606d2b01881e91b6baa880974a7896b9 100644 (file)
--- a/misc/auto-completion/bash/nnn-completion.bash
+++ b/misc/auto-completion/bash/nnn-completion.bash
@@ -19,7 +19,6 @@ _nnn ()
         -E
         -g
         -H
-        -i
         -K
         -n
         -o
@@ -31,6 +30,7 @@ _nnn ()
         -S
         -t
         -v
+        -V
         -x
         -h
     )

diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish
index c71d33cc7263ce04f6faa7a7678f473956e57221..f597886e6063cf44131287c848965317ab7e8e5b 100644 (file)
--- a/misc/auto-completion/fish/nnn.fish
+++ b/misc/auto-completion/fish/nnn.fish
@@ -18,9 +18,8 @@ complete -c nnn -s d    -d 'start in detail mode'
 complete -c nnn -s E    -d 'use EDITOR for undetached edits'
 complete -c nnn -s g    -d 'regex filters'
 complete -c nnn -s H    -d 'show hidden files'
-complete -c nnn -s i    -d 'start in navigate-as-you-type mode'
 complete -c nnn -s K    -d 'detect key collision'
-complete -c nnn -s n    -d 'use version compare to sort files'
+complete -c nnn -s n    -d 'start in navigate-as-you-type mode'
 complete -c nnn -s o    -d 'open files only on Enter'
 complete -c nnn -s p -r -d 'copy selection to file' -a '-\tstdout'
 complete -c nnn -s Q    -d 'disable quit confirmation'
@@ -30,5 +29,6 @@ complete -c nnn -s s -r -d 'load session by name' -x -a '@\t"last session" (ls $
 complete -c nnn -s S    -d 'start in disk usage analyzer mode'
 complete -c nnn -s t    -d 'disable dir auto-select'
 complete -c nnn -s v    -d 'show program version and exit'
+complete -c nnn -s V    -d 'use version compare to sort files'
 complete -c nnn -s x    -d 'notis, sel to system clipboard'
 complete -c nnn -s h    -d 'show program help'

diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn
index c37012c8024e77e1332d892c9e2fcb63f2c07b0e..a8b5f23884f18b9823604b19d06eb3edf268f61b 100644 (file)
--- a/misc/auto-completion/zsh/_nnn
+++ b/misc/auto-completion/zsh/_nnn
@@ -16,9 +16,8 @@ args=(
     '(-E)-E[use EDITOR for undetached edits]'
     '(-g)-g[regex filters]'
     '(-H)-H[show hidden files]'
-    '(-i)-i[start in navigate-as-you-type mode]'
     '(-K)-K[detect key collision]'
-    '(-n)-n[use version compare to sort files]'
+    '(-n)-n[start in navigate-as-you-type mode]'
     '(-o)-o[open files only on Enter]'
     '(-p)-p[copy selection to file]:file name'
     '(-Q)-Q[disable quit confirmation]'
@@ -28,6 +27,7 @@ args=(
     '(-S)-S[start in disk usage analyzer mode]'
     '(-t)-t[disable dir auto-select]'
     '(-v)-v[show program version and exit]'
+    '(-V)-V[use version compare to sort files]'
     '(-x)-x[notis, sel to system clipboard]'
     '(-h)-h[show program help]'
     '*:filename:_files'

diff --git a/nnn.1 b/nnn.1
index 9b8a806cd4bb143660d2e1dc43b4ab8ab8489616..33fbb6569f939cae44d05e44a31fd79384d40c0b 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -13,7 +13,6 @@
 .Op Ar -E
 .Op Ar -g
 .Op Ar -H
-.Op Ar -i
 .Op Ar -K
 .Op Ar -n
 .Op Ar -p file
@@ -23,6 +22,7 @@
 .Op Ar -s name
 .Op Ar -S
 .Op Ar -v
+.Op Ar -V
 .Op Ar -x
 .Op Ar -h
 .Op Ar PATH
@@ -65,14 +65,11 @@ supports the following options:
 .Fl H
         show hidden files
 .Pp
-.Fl i
-        start in navigate-as-you-type mode
-.Pp
 .Fl K
         test for keybind collision
 .Pp
 .Fl n
-        use case-insensitive version compare to sort files
+        start in navigate-as-you-type mode
 .Pp
 .Fl o
         open files only on Enter key
@@ -101,6 +98,9 @@ supports the following options:
 .Fl v
         show version and exit
 .Pp
+.Fl V
+        use case-insensitive version compare to sort files
+.Pp
 .Fl x
         show notis on selection cp, mv, rm completion; copy path to system clipboard on select
 .Pp

diff --git a/src/nnn.c b/src/nnn.c
index a4207778d4f0cfec7c6f14fe504bc17db548acd8..d67ea964a7c5e32b2b8c5e7f4d96b881fa79ba48 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -5495,9 +5495,8 @@ static void usage(void)
                " -E      use EDITOR for undetached edits\n"
                " -g      regex filters [default: string]\n"
                " -H      show hidden files\n"
-               " -i      nav-as-you-type mode\n"
                " -K      detect key collision\n"
-               " -n      version sort\n"
+               " -n      nav-as-you-type mode\n"
                " -o      open files on Enter\n"
                " -p file selection file [stdout if '-']\n"
                " -Q      no quit confirmation\n"
@@ -5507,6 +5506,7 @@ static void usage(void)
                " -S      du mode\n"
                " -t      no dir auto-select\n"
                " -v      show version\n"
+               " -V      version sort\n"
                " -x      notis, sel to system clipboard\n"
                " -h      show help\n\n"
                "v%s\n%s\n", __func__, VERSION, GENERAL_INFO);
@@ -5650,7 +5650,7 @@ int main(int argc, char *argv[])
        bool progress = FALSE;
 #endif
 
-       while ((opt = getopt(argc, argv, "HSKiab:cdEgnop:QrRs:tvxh")) != -1) {
+       while ((opt = getopt(argc, argv, "HSKab:cdEgnop:QrRs:tvVxh")) != -1) {
                switch (opt) {
                case 'S':
                        cfg.blkorder = 1;
@@ -5660,9 +5660,6 @@ int main(int argc, char *argv[])
                        cfg.showdetail = 1;
                        printptr = &printent_long;
                        break;
-               case 'i':
-                       cfg.filtermode = 1;
-                       break;
                case 'a':
                        cfg.mtime = 0;
                        break;
@@ -5683,7 +5680,7 @@ int main(int argc, char *argv[])
                        cfg.showhidden = 1;
                        break;
                case 'n':
-                       cmpfn = &xstrverscasecmp;
+                       cfg.filtermode = 1;
                        break;
                case 'o':
                        cfg.nonavopen = 1;
@@ -5728,6 +5725,9 @@ int main(int argc, char *argv[])
                case 'v':
                        fprintf(stdout, "%s\n", VERSION);
                        return _SUCCESS;
+               case 'V':
+                       cmpfn = &xstrverscasecmp;
+                       break;
                case 'x':
                        cfg.x11 = 1;
                        break;