Add shortcut ^G to quit and cd

diff --git a/CHANGELOG b/CHANGELOG
index 225f412ca0a871b8b637306f0a8e5692ad66e86b..bf3fe8c1c501ddfd26f86d48325d047612d6ff4a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ What's in?
   - <kbd>^J</kbd> - toggle du mode
   - <kbd>R</kbd> - batch rename files in vidir
   - <kbd>^F</kbd> - extract archive (replaces <kbd>^X</kbd>)
+  - <kbd>^G</kbd> - quit nnn and change dir
   - <kbd>^X</kbd> - quit nnn (replaces <kbd>^Q</kbd>)
 - Extra shortcuts enabled in nav-as-you-type mode:
   - <kbd>^K</kbd>, <kbd>^Y</kbd> (file path copy)
@@ -25,6 +26,7 @@ What's in?
   - <kbd>^/</kbd> (open desktop opener)
   - <kbd>^F</kbd> (extract archive)
   - <kbd>^L</kbd> (refresh)
+  - <kbd>^G</kbd> (quit nnn and change dir)
   - <kbd>^X</kbd> (quit nnn)
 
 -------------------------------------------------------------------------------

diff --git a/README.md b/README.md
index 6cebcf3f0a0e17929f43a7a5034ae60689d0ade6..3ca10820e6b8b6a778b4185cb3a4fb2b50388cf0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -119,7 +119,6 @@ Have fun with it! PRs are welcome. Check out [#1](https://github.com/jarun/nnn/i
   - Terminal screensaver (default vlock, customizable) integration
 - Unicode support
 - Highly optimized code, minimal resource usage
-- Minimal dependencies
 
 ### Performance
 
@@ -254,7 +253,7 @@ optional arguments:
              ^T | Toggle path quote
              ^L | Redraw, clear prompt
               ? | Help, settings
-              Q | Quit and cd
+          Q, ^G | Quit and cd
           q, ^X | Quit
 ```
 
@@ -331,6 +330,8 @@ Add the following to your shell's rc file for the best experience:
 
 5. Set `NNN_NOWAIT`, if nnn [blocks on your desktop environment](#nnn-blocks-on-opening-files) when a file is open.
 
+6. Press <kbd>?</kbd> for help on keyboard shortcuts anytime.
+
 ### How to
 
 #### add bookmarks

diff --git a/nnn.1 b/nnn.1
index 9308f770fd6c8bfb03f0556b913436f3141a161c..df5cc450ef584805054e82d6e9591b36be6f7e0e 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -112,7 +112,7 @@ Toggle path quote
 Force a redraw, clear rename or filter prompt
 .It Ic \&?
 Toggle help and settings screen
-.It Ic Q
+.It Ic Q, ^G
 Quit and change directory
 .It Ic q, ^X
 Quit

diff --git a/nnn.c b/nnn.c
index 6a11fa73fe0a33a948cc1c6f53f10c5c0c7c0f77..9dfad66ee0f16231ca15079d44d339038baafe24 100644 (file)
--- a/nnn.c
+++ b/nnn.c
@@ -1141,6 +1141,7 @@ filterentries(char *path)
                        case CONTROL('B'): // fallthrough
                        case CONTROL('V'): // fallthrough
                        case CONTROL('J'): // fallthrough
+                       case CONTROL('G'): // fallthrough
                        case CONTROL('X'): // fallthrough
                        case CONTROL('F'): // fallthrough
                        case CONTROL('T'):
@@ -1891,7 +1892,7 @@ show_help(char *path)
            "d^T | Toggle path quote\n"
            "d^L | Redraw, clear prompt\n"
             "e? | Help, settings\n"
-            "eQ | Quit and cd\n"
+        "aQ, ^G | Quit and cd\n"
         "aq, ^X | Quit\n\n");
 
        if (fd == -1)

diff --git a/nnn.h b/nnn.h
index 8ab86575b781a348e529838dbe1a9d8428aa0928..60e277d7c14461dfcd735770f26af142405e5cc6 100644 (file)
--- a/nnn.h
+++ b/nnn.h
@@ -170,6 +170,7 @@ static struct key bindings[] = {
        { 'p',            SEL_RUNARG,    "less", "PAGER" },
        /* Change dir on quit */
        { 'Q',            SEL_CDQUIT,    "",     "" },
+       { CONTROL('G'),   SEL_CDQUIT,    "",     "" },
        /* Quit */
        { 'q',            SEL_QUIT,      "",     "" },
        { CONTROL('X'),   SEL_QUIT,      "",     "" },