]> Sergey Matveev's repositories - nnn.git/commitdiff
Bookmark key get priority over session
authorArun Prakash Jana <engineerarun@gmail.com>
Fri, 24 Apr 2020 04:24:43 +0000 (09:54 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Fri, 24 Apr 2020 04:24:43 +0000 (09:54 +0530)
src/nnn.c

index 80f13a69c6f545262ffa7e13b08c1e10db87ec4b..86b09d45743bdc477693a8e3177f5875e552aeb7 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -6510,8 +6510,8 @@ static void usage(void)
                "  PATH   start dir [default: .]\n\n"
                "optional args:\n"
                " -A      no dir auto-select\n"
-               " -b key  open bookmark key\n"
-               " -c      cli-only opener (overrides -e)\n"
+               " -b key  open bookmark key (trumps -s/S)\n"
+               " -c      cli-only NNN_OPENER (trumps -e)\n"
                " -d      detail mode\n"
                " -e      text in $VISUAL/$EDITOR/vi\n"
                " -E      use EDITOR for undetached edits\n"
@@ -6853,6 +6853,9 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "%s\n", messages[MSG_INVALID_KEY]);
                                return _FAILURE;
                        }
+
+                       if (session)
+                               session = NULL;
                } else if (argc == optind) {
                        /* Start in the current directory */
                        initpath = getcwd(NULL, PATH_MAX);