mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant prompt

This commit is contained in:
Arun Prakash Jana 2021-07-12 00:30:41 +05:30
parent e94ac0b91b
commit baca4693ec
No known key found for this signature in database
GPG Key ID: A75979F35C080412
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -26,7 +26,6 @@ O_BENCH := 0 # benchmark mode (stops at first user input)
O_NOSSN := 0 # enable session support
O_NOUG := 0 # disable user, group name in status bar
O_NOX11 := 0 # disable X11 integration
O_LARGESEL := 0 # set threshold for large selection
# User patches
O_GITSTATUS := 0 # add git status to detail view
@ -116,10 +115,6 @@ ifeq ($(strip $(O_NOX11)),1)
CPPFLAGS += -DNOX11
endif
ifneq ($(strip $(O_LARGESEL)),0)
CPPFLAGS += -DLARGESEL=$(strip $(O_LARGESEL))
endif
ifeq ($(shell $(PKG_CONFIG) ncursesw && echo 1),1)
CFLAGS_CURSES ?= $(shell $(PKG_CONFIG) --cflags ncursesw)
LDLIBS_CURSES ?= $(shell $(PKG_CONFIG) --libs ncursesw)

5
misc/haiku/Makefile
View File

@ -24,7 +24,6 @@ O_BENCH := 0 # benchmark mode (stops at first user input)
O_NOSSN := 0 # enable session support
O_NOUG := 0 # disable user, group name in status bar
O_NOX11 := 0 # disable X11 integration
O_LARGESEL := 0 # set threshold for large selection
# User patches
O_GITSTATUS := 0 # add git status to detail view
@ -119,10 +118,6 @@ ifeq ($(strip $(O_NOX11)),1)
CPPFLAGS += -DNOX11
endif
ifneq ($(strip $(O_LARGESEL)),0)
CPPFLAGS += -DLARGESEL=$(strip $(O_LARGESEL))
endif
ifeq ($(shell $(PKG_CONFIG) ncursesw && echo 1),1)
CFLAGS_CURSES ?= $(shell $(PKG_CONFIG) --cflags ncursesw)
LDLIBS_CURSES ?= $(shell $(PKG_CONFIG) --libs ncursesw)

14
src/nnn.c
View File

@ -611,9 +611,8 @@ static char * const utils[] = {
#define MSG_RM_TMP 39
#define MSG_INVALID_KEY 40
#define MSG_NOCHANGE 41
#define MSG_LARGESEL 42
#ifndef DIR_LIMITED_SELECTION
#define MSG_DIR_CHANGED 43 /* Must be the last entry */
#define MSG_DIR_CHANGED 42 /* Must be the last entry */
#endif
static const char * const messages[] = {
@ -659,7 +658,6 @@ static const char * const messages[] = {
"remove tmp file?",
"invalid key",
"unchanged",
"inversion may be slow, continue?",
#ifndef DIR_LIMITED_SELECTION
"dir changed, range sel off", /* Must be the last entry */
#endif
@ -1571,17 +1569,15 @@ static int markcmp(const void *va, const void *vb)
static void invertselbuf(char *path)
{
/* This may be slow for large selection, ask for confirmation */
if (nselected > LARGESEL && !xconfirm(get_input(messages[MSG_LARGESEL])))
return;
size_t len, endpos, offset = 0;
char *found;
int nmarked = 0, prev = 0;
selmark *marked = malloc(nselected * sizeof(selmark));
printmsg("processing...");
refresh();
if (nselected > LARGESEL) {
printmsg("processing...");
refresh();
}
/* First pass: inversion */
for (int i = 0; i < ndents; ++i) {