Don't remember initial dir per-context

diff --git a/README.md b/README.md
index 1623e6fc500cfb6b1f592ffe2638f4ca611cfae7..fc2c4d899823096eae98c23ddc78ffa0686a7f3d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -299,7 +299,7 @@ Contexts serve the purpose of exploring multiple directories simultaneously. 4 c
 
 To switch to a context press the Leader key followed by the context number (1-4).
 
-The first time a context is entered, it copies the state of the last visited context. Each context remembers its start directory and last visited directory.
+The first time a context is entered, it copies the state of the last visited context. Each context remembers its last visited directory.
 
 When a context is quit, the next active context is selected. If the last active context is quit, the program quits.
 

diff --git a/nnn.1 b/nnn.1
index 73ec86ea519bfc1fd149ba243c932a4e529dddb1..a52ec59f034343f762cb79dc4e542ae62a6d494c 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -230,7 +230,7 @@ are available. The status of the contexts are shown in the top left corner:
 .Pp
 To switch to a context press the Leader key followed by the context number (1-4).
 .Pp
-The first time a context is entered, it copies the state of the last visited context. Each context remembers its start directory and last visited directory.
+The first time a context is entered, it copies the state of the last visited context. Each context remembers its last visited directory.
 .Pp
 When a context is quit, the next active context is selected. If the last active context is quit, the program quits.
 .Sh FILTERS

diff --git a/src/nnn.c b/src/nnn.c
index 8e426f02cdf92ed32ff73243b3d1bc3ba2bc2583..014b073c0eee1943b8a541160f609a675e3c46a1 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -302,7 +302,6 @@ typedef struct {
 /* Contexts or workspaces */
 typedef struct {
        char c_path[PATH_MAX]; /* Current dir */
-       char c_init[PATH_MAX]; /* Initial dir */
        char c_last[PATH_MAX]; /* Last visited dir */
        char c_name[NAME_MAX + 1]; /* Current file name */
        settings c_cfg; /* Current configuration */
@@ -2876,7 +2875,6 @@ static void browse(char *ipath)
        /* setup first context */
        xstrlcpy(g_ctx[0].c_path, ipath, PATH_MAX); /* current directory */
        path = g_ctx[0].c_path;
-       xstrlcpy(g_ctx[0].c_init, ipath, PATH_MAX); /* start directory */
        g_ctx[0].c_last[0] = g_ctx[0].c_name[0] = newpath[0] = mark[0] = '\0';
        rundir[0] = runfile[0] = '\0';
        lastdir = g_ctx[0].c_last; /* last visited directory */
@@ -3201,7 +3199,6 @@ nochange:
                                else { /* Setup a new context from current context */
                                        g_ctx[r].c_cfg.ctxactive = 1;
                                        xstrlcpy(g_ctx[r].c_path, path, PATH_MAX);
-                                       xstrlcpy(g_ctx[r].c_init, path, PATH_MAX);
                                        g_ctx[r].c_last[0] = '\0';
                                        xstrlcpy(g_ctx[r].c_name, dents[cur].name, NAME_MAX + 1);
                                        g_ctx[r].c_cfg = cfg;
@@ -3210,7 +3207,6 @@ nochange:
 
                                /* Reset the pointers */
                                path = g_ctx[r].c_path;
-                               ipath = g_ctx[r].c_init;
                                lastdir = g_ctx[r].c_last;
                                lastname = g_ctx[r].c_name;
 
@@ -3953,7 +3949,6 @@ nochange:
 
                                                /* Switch to next active context */
                                                path = g_ctx[r].c_path;
-                                               ipath = g_ctx[r].c_init;
                                                lastdir = g_ctx[r].c_last;
                                                lastname = g_ctx[r].c_name;
                                                cfg = g_ctx[r].c_cfg;