From c3ce5bc705e2918cd21815611c21cd1d2c15b19e Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 11 Sep 2019 18:28:41 +0530 Subject: [PATCH] Preserve attributes on duplicate, update docs --- README.md | 2 +- nnn.1 | 4 ++-- src/nnn.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fbd36a05..e6d0d6b6 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ optional args: -a use access time -b key open bookmark key -d detail mode - -f run filter as cmd on ^P + -f run filter as cmd on prompt key -H show hidden files -i nav-as-you-type mode -n version sort diff --git a/nnn.1 b/nnn.1 index acc84931..dbe618f7 100644 --- a/nnn.1 +++ b/nnn.1 @@ -48,7 +48,7 @@ supports the following options: detail mode .Pp .Fl f - run filter as command when ^P is pressed + run filter as command when the prompt key is pressed .Pp .Fl H show hidden files @@ -120,7 +120,7 @@ with a '^' (caret) symbol. .Pp There is a program option to filter entries by substring match instead of regex. .Pp -There is a program option to execute the current filter as a command when \fI^P\fR is pressed. +There is a program option to execute the current filter as a command when the prompt key is pressed. .Pp In the \fInavigate-as-you-type\fR mode directories are opened in filter mode, allowing continuous navigation. Works best with the \fBarrow keys\fR. diff --git a/src/nnn.c b/src/nnn.c index 0ad0a691..666b9209 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -151,6 +151,7 @@ #define F_NORMAL 0x08 /* spawn child process in non-curses regular CLI mode */ #define F_CMD 0x10 /* run command - show results before exit (must have F_NORMAL) */ #define F_CLI (F_NORMAL | F_MULTI) +#define F_SILENT (F_CLI | F_NOTRACE) /* CRC8 macros */ #define UCHAR_BIT_WIDTH (sizeof(unsigned char) << 3) @@ -4279,7 +4280,7 @@ nochange: if (sel == SEL_RENAME) { /* Rename the file */ if (dup == 'd') - spawn("cp -r", dents[cur].name, tmp, path, F_CLI | F_NOTRACE); + spawn("cp -rp", dents[cur].name, tmp, path, F_SILENT); else if (renameat(fd, dents[cur].name, fd, tmp) != 0) { close(fd); printwarn(&presel); @@ -4535,7 +4536,7 @@ static void usage(void) " -a use access time\n" " -b key open bookmark key\n" " -d detail mode\n" - " -f run filter as cmd on ^P\n" + " -f run filter as cmd on prompt key\n" " -H show hidden files\n" " -i nav-as-you-type mode\n" " -n version sort\n"