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

Support only NO_COLOR, revert -C to disable color

This commit is contained in:
Arun Prakash Jana 2020-04-05 13:04:14 +05:30
parent f14fb9c0f9
commit 1014d941b1
No known key found for this signature in database
GPG Key ID: A75979F35C080412
5 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/auto-completion/bash/nnn-completion.bash
View File

@ -15,7 +15,6 @@ _nnn ()
-A -A
-b -b
-c -c
-C
-d -d
-e -e
-E -E

1
misc/auto-completion/fish/nnn.fish
View File

@ -14,7 +14,6 @@ end
complete -c nnn -s A -d 'disable dir auto-select' complete -c nnn -s A -d 'disable dir auto-select'
complete -c nnn -s b -r -d 'bookmark key to open' -x -a '(echo $NNN_BMS | awk -F: -v RS=\; \'{print $1"\t"$2}\')' complete -c nnn -s b -r -d 'bookmark key to open' -x -a '(echo $NNN_BMS | awk -F: -v RS=\; \'{print $1"\t"$2}\')'
complete -c nnn -s c -d 'cli-only opener' complete -c nnn -s c -d 'cli-only opener'
complete -c nnn -s C -d 'disable color'
complete -c nnn -s d -d 'start in detail mode' complete -c nnn -s d -d 'start in detail mode'
complete -c nnn -s e -d 'open text files in $VISUAL/$EDITOR/vi' complete -c nnn -s e -d 'open text files in $VISUAL/$EDITOR/vi'
complete -c nnn -s E -d 'use EDITOR for undetached edits' complete -c nnn -s E -d 'use EDITOR for undetached edits'

1
misc/auto-completion/zsh/_nnn
View File

@ -12,7 +12,6 @@ args=(
'(-A)-A[disable dir auto-select]' '(-A)-A[disable dir auto-select]'
'(-b)-b[bookmark key to open]:key char' '(-b)-b[bookmark key to open]:key char'
'(-c)-c[cli-only opener]' '(-c)-c[cli-only opener]'
'(-C)-C[disable color]'
'(-d)-d[start in detail mode]' '(-d)-d[start in detail mode]'
'(-e)-e[open text files in $VISUAL/$EDITOR/vi]' '(-e)-e[open text files in $VISUAL/$EDITOR/vi]'
'(-E)-E[use EDITOR for undetached edits]' '(-E)-E[use EDITOR for undetached edits]'

4
nnn.1
View File

@ -9,7 +9,6 @@
.Op Ar -A .Op Ar -A
.Op Ar -b key .Op Ar -b key
.Op Ar -c .Op Ar -c
.Op Ar -C
.Op Ar -d .Op Ar -d
.Op Ar -e .Op Ar -e
.Op Ar -E .Op Ar -E
@ -63,9 +62,6 @@ supports the following options:
.Fl c .Fl c
opener opens files in cli utilities only (overrides -e) opener opens files in cli utilities only (overrides -e)
.Pp .Pp
.Fl C
disable color
.Pp
.Fl d .Fl d
detail mode detail mode
.Pp .Pp

15
src/nnn.c
View File

@ -400,7 +400,6 @@ static char g_pipepath[TMP_LEN_MAX] __attribute__ ((aligned));
#define STATE_TRASH 0x40 #define STATE_TRASH 0x40
#define STATE_FORCEQUIT 0x80 #define STATE_FORCEQUIT 0x80
#define STATE_FORTUNE 0x100 #define STATE_FORTUNE 0x100
#define STATE_NOCOLOR 0x200
static uint g_states; static uint g_states;
@ -1489,9 +1488,6 @@ static void export_file_list(void)
/* Initialize curses mode */ /* Initialize curses mode */
static bool initcurses(void *oldmask) static bool initcurses(void *oldmask)
{ {
short i;
char *colors = xgetenv(env_cfg[NNN_COLORS], "4444");
#ifdef NOMOUSE #ifdef NOMOUSE
(void) oldmask; (void) oldmask;
#endif #endif
@ -1524,7 +1520,10 @@ static bool initcurses(void *oldmask)
#endif #endif
curs_set(FALSE); /* Hide cursor */ curs_set(FALSE); /* Hide cursor */
if (!(g_states & STATE_NOCOLOR || getenv("NO_COLOR"))) { if (!getenv("NO_COLOR")) {
short i;
char *colors = xgetenv(env_cfg[NNN_COLORS], "4444");
start_color(); start_color();
use_default_colors(); use_default_colors();
@ -6588,7 +6587,6 @@ static void usage(void)
" -A no dir auto-select\n" " -A no dir auto-select\n"
" -b key open bookmark key\n" " -b key open bookmark key\n"
" -c cli-only opener (overrides -e)\n" " -c cli-only opener (overrides -e)\n"
" -C disable color\n"
" -d detail mode\n" " -d detail mode\n"
" -e text in $VISUAL/$EDITOR/vi\n" " -e text in $VISUAL/$EDITOR/vi\n"
" -E use EDITOR for undetached edits\n" " -E use EDITOR for undetached edits\n"
@ -6760,7 +6758,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0 while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id] ? env_opts[--env_opts_id]
: getopt(argc, argv, "Ab:cCdeEfFgHKnop:QrRs:St:T:Vxh"))) != -1) { : getopt(argc, argv, "Ab:cdeEfFgHKnop:QrRs:St:T:Vxh"))) != -1) {
switch (opt) { switch (opt) {
case 'A': case 'A':
cfg.autoselect = 0; cfg.autoselect = 0;
@ -6771,9 +6769,6 @@ int main(int argc, char *argv[])
case 'c': case 'c':
cfg.cliopener = 1; cfg.cliopener = 1;
break; break;
case 'C':
g_states |= STATE_NOCOLOR;
break;
case 'S': case 'S':
cfg.blkorder = 1; cfg.blkorder = 1;
nftw_fn = sum_bsize; nftw_fn = sum_bsize;