mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-18 00:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Enter type-to-nav for bookmarks dir"

Browse source 
This reverts commit 8cdeddeb4a.
This commit is contained in:
Arun Prakash Jana 2022-05-30 22:20:45 +05:30
parent 85be28c019
commit 10e2d37d0f
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nnn.c
View file

@ -367,12 +367,12 @@ typedef struct {
uint_t rangesel : 1; /* Range selection on */ uint_t rangesel : 1; /* Range selection on */
uint_t runctx : 3; /* The context in which plugin is to be run */ uint_t runctx : 3; /* The context in which plugin is to be run */
uint_t runplugin : 1; /* Choose plugin mode */ uint_t runplugin : 1; /* Choose plugin mode */
uint_t selbm : 2; /* Select bookmark dir and store type-to-nav */ uint_t selbm : 1; /* Select a bookmark from bookmarks directory */
uint_t selmode : 1; /* Set when selecting files */ uint_t selmode : 1; /* Set when selecting files */
uint_t stayonsel : 1; /* Disable auto-jump on select */ uint_t stayonsel : 1; /* Disable auto-jump on select */
uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */ uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */
uint_t uidgid : 1; /* Show owner and group info */ uint_t uidgid : 1; /* Show owner and group info */
uint_t reserved : 5; /* Adjust when adding/removing a field */ uint_t reserved : 6; /* Adjust when adding/removing a field */
} runstate; } runstate;
/* Contexts or workspaces */ /* Contexts or workspaces */
@ -4988,18 +4988,15 @@ static size_t handle_bookmark(const char *bmark, char *newpath)
bmark ? xstrsncpy(newpath, bmark, PATH_MAX) : (r = MSG_NOT_SET); bmark ? xstrsncpy(newpath, bmark, PATH_MAX) : (r = MSG_NOT_SET);
else if (fd == '\r') { /* Visit bookmarks directory */ else if (fd == '\r') { /* Visit bookmarks directory */
mkpath(cfgpath, toks[TOK_BM], newpath); mkpath(cfgpath, toks[TOK_BM], newpath);
g_state.selbm = cfg.filtermode + 1; g_state.selbm = 1;
cfg.filtermode = 1;
} else if (!get_kv_val(bookmark, newpath, fd, maxbm, NNN_BMS)) } else if (!get_kv_val(bookmark, newpath, fd, maxbm, NNN_BMS))
r = MSG_INVALID_KEY; r = MSG_INVALID_KEY;
if (!r && chdir(newpath) == -1) { if (!r && chdir(newpath) == -1) {
r = MSG_ACCESS; r = MSG_ACCESS;
if (g_state.selbm) { if (g_state.selbm)
cfg.filtermode = g_state.selbm - 1;
g_state.selbm = 0; g_state.selbm = 0;
} }
}
return r; return r;
} }
@ -6907,7 +6904,6 @@ nochange:
/* Cannot descend in empty directories */ /* Cannot descend in empty directories */
if (!ndents) { if (!ndents) {
cd = FALSE; cd = FALSE;
cfg.filtermode = g_state.selbm - 1;
g_state.selbm = g_state.runplugin = 0; g_state.selbm = g_state.runplugin = 0;
goto begin; goto begin;
} }
@ -6917,7 +6913,6 @@ nochange:
S_ISLNK(pent->mode) S_ISLNK(pent->mode)
? (realpath(pent->name, newpath) && xstrsncpy(path, lastdir, PATH_MAX)) ? (realpath(pent->name, newpath) && xstrsncpy(path, lastdir, PATH_MAX))
: mkpath(path, pent->name, newpath); : mkpath(path, pent->name, newpath);
cfg.filtermode = g_state.selbm - 1;
g_state.selbm = 0; g_state.selbm = 0;
} else } else
mkpath(path, pent->name, newpath); mkpath(path, pent->name, newpath);