From 752bc67de03d158ece3f0fb43f6f2a3e6b2011b9 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Fri, 24 Apr 2020 09:54:43 +0530 Subject: [PATCH] Bookmark key get priority over session --- src/nnn.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index 80f13a69..86b09d45 100644 --- 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);