From 37988cf854f4688614dd3f00a4ec04d55552dbb6 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Fri, 20 Dec 2019 15:49:13 +0530
Subject: Program option to load session is now `-s`

- remove auto-stored session "@" on restore
- minor help update
---
 src/nnn.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/nnn.c b/src/nnn.c
index e7ae502..57432d9 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -2945,7 +2945,8 @@ END:
 	if (!status) {
 		printmsg(messages[MSG_FAILED]);
 		xdelay(XDELAY_INTERVAL_MS);
-	}
+	} else if (restore)
+		unlink(spath);
 
 	return status;
 }
@@ -3474,7 +3475,7 @@ static void show_help(const char *path)
 	    "6(Sh)Tab  Cycle context%-11cd  Detail view toggle\n"
 		  "c/  Filter%-13cIns ^N  Nav-as-you-type toggle\n"
 		"aEsc  Exit prompt%-9c^L F5  Redraw/clear prompt\n"
-		  "c.  Hidden toggle%-11c?  Help, conf\n"
+		  "c.  Toggle hidden%-11c?  Help, conf\n"
 	       "9Q ^Q  Quit%-20cq  Quit context\n"
 		 "b^G  QuitCD%-1c\n"
 		"1FILES\n"
@@ -5488,7 +5489,6 @@ static void usage(void)
 		" -b key  open bookmark key\n"
 		" -c      cli-only opener\n"
 		" -d      detail mode\n"
-		" -e name load session by name\n"
 		" -E      use EDITOR for undetached edits\n"
 		" -g      regex filters [default: string]\n"
 		" -H      show hidden files\n"
@@ -5500,6 +5500,7 @@ static void usage(void)
 		" -Q      no quit confirmation\n"
 		" -r      use advcpmv patched cp, mv\n"
 		" -R      no rollover at edges\n"
+		" -s name load session by name\n"
 		" -S      du mode\n"
 		" -t      no dir auto-select\n"
 		" -v      show version\n"
@@ -5646,7 +5647,7 @@ int main(int argc, char *argv[])
 	bool progress = FALSE;
 #endif
 
-	while ((opt = getopt(argc, argv, "HSKiab:cde:Egnop:QrRtvxh")) != -1) {
+	while ((opt = getopt(argc, argv, "HSKiab:cdEgnop:QrRs:tvxh")) != -1) {
 		switch (opt) {
 		case 'S':
 			cfg.blkorder = 1;
@@ -5668,9 +5669,6 @@ int main(int argc, char *argv[])
 		case 'c':
 			cfg.cliopener = 1;
 			break;
-		case 'e':
-			session = optarg;
-			break;
 		case 'E':
 			cfg.waitedit = 1;
 			break;
@@ -5715,6 +5713,9 @@ int main(int argc, char *argv[])
 		case 'R':
 			cfg.rollover = 0;
 			break;
+		case 's':
+			session = optarg;
+			break;
 		case 't':
 			cfg.autoselect = 0;
 			break;
-- 
cgit v1.2.3-70-g09d2