mirror of
https://github.com/jarun/nnn.git
synced 2025-03-18 20:39:45 +00:00
Incorporate PR #368
This commit is contained in:
parent
5077b020bc
commit
53a2e4c560
1 changed files with 12 additions and 10 deletions
22
src/nnn.c
22
src/nnn.c
|
@ -3424,7 +3424,7 @@ static bool run_selected_plugin(char **path, const char *file, char *newpath, ch
|
||||||
if (len > 1) {
|
if (len > 1) {
|
||||||
int ctx = g_buf[0] - '0';
|
int ctx = g_buf[0] - '0';
|
||||||
|
|
||||||
if (ctx == 0) {
|
if (ctx == 0 || ctx == cfg.curctx + 1) {
|
||||||
xstrlcpy(*lastdir, *path, PATH_MAX);
|
xstrlcpy(*lastdir, *path, PATH_MAX);
|
||||||
xstrlcpy(*path, g_buf + 1, PATH_MAX);
|
xstrlcpy(*path, g_buf + 1, PATH_MAX);
|
||||||
} else if (ctx >= 1 && ctx <= CTX_MAX) {
|
} else if (ctx >= 1 && ctx <= CTX_MAX) {
|
||||||
|
@ -4966,18 +4966,20 @@ nochange:
|
||||||
if (tmp[0] == '_' && tmp[1]) {
|
if (tmp[0] == '_' && tmp[1]) {
|
||||||
xstrlcpy(newpath, ++tmp, PATH_MAX);
|
xstrlcpy(newpath, ++tmp, PATH_MAX);
|
||||||
flag = F_CLI | F_CONFIRM;
|
flag = F_CLI | F_CONFIRM;
|
||||||
tmp = NULL;
|
spawn(newpath, (ndents ? dents[cur].name : NULL),
|
||||||
|
NULL, path, flag);
|
||||||
} else {
|
} else {
|
||||||
mkpath(plugindir, tmp, newpath);
|
xstrlcpy(rundir, path, PATH_MAX);
|
||||||
tmp = path;
|
xstrlcpy(path, plugindir, PATH_MAX);
|
||||||
|
if (!run_selected_plugin(&path, tmp, newpath, rundir,
|
||||||
|
(ndents ? dents[cur].name : NULL),
|
||||||
|
&lastname, &lastdir))
|
||||||
|
goto nochange;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
spawn(newpath, (ndents ? dents[cur].name : NULL),
|
setdirwatch();
|
||||||
tmp, path, flag);
|
goto begin;
|
||||||
|
|
||||||
if (cfg.filtermode)
|
|
||||||
presel = FILTER;
|
|
||||||
goto nochange;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg.runplugin ^= 1;
|
cfg.runplugin ^= 1;
|
||||||
|
|
Loading…
Add table
Reference in a new issue