aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Arun Prakash Jana <engineerarun@gmail.com>2017-06-06 21:37:16 +0530
committerGravatar Arun Prakash Jana <engineerarun@gmail.com>2017-06-06 23:32:40 +0530
commit6a9640afdf07769c9be891cfae6660179b403db3 (patch)
tree88cf11c83db8f6dea2f96746e865c9b26bbba421
parentf52367a48168f95545bc15148b58076ce56155f8 (diff)
downloadnnn-6a9640afdf07769c9be891cfae6660179b403db3.tar.gz
Exit once an app is found. Help, doc updates.
-rw-r--r--README.md2
-rwxr-xr-xnlay3
-rw-r--r--nnn.16
-rw-r--r--nnn.c4
4 files changed, 8 insertions, 7 deletions
diff --git a/README.md b/README.md
index 1d62caf..651d953 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ Right, Enter, l, ^M | Open file or enter dir
o | Open dir in NNN_DE_FILE_MANAGER
p | Open entry in PAGER (fallback less)
^K | Invoke file path copier
- ^L | Force a redraw
+ ^L | Force a redraw, exit filter prompt
? | Toggle help screen
Q | Quit and change directory
q, ^Q | Quit
diff --git a/nlay b/nlay
index 53d89e3..437dd7e 100755
--- a/nlay
+++ b/nlay
@@ -88,5 +88,6 @@ fi
for index in ${!app[@]}
do
type -P ${app[$index]} &>/dev/null &&
- eval ${app[$index]} ${opts[$index]} "\"$1\"" ${bg[$index]}
+ eval ${app[$index]} ${opts[$index]} "\"$1\"" ${bg[$index]} &&
+ break
done
diff --git a/nnn.1 b/nnn.1
index d929fdc..a80bef7 100644
--- a/nnn.1
+++ b/nnn.1
@@ -84,7 +84,7 @@ Open current entry in PAGER (fallback less)
.It Ic ^K
Invoke file path copier
.It Ic ^L
-Force a redraw
+Force a redraw, exit filter prompt
.It Ic \&?
Toggle help screen
.It Ic Q
@@ -136,7 +136,7 @@ instructions.
Filters support regexes to display only the matched
entries in the current directory view. This effectively allows
searching through the directory tree for a particular entry. Matching entries
-are shown instantly (search-as-you-type).
+are shown instantly (\fIsearch-as-you-type\fR).
.Pp
Filters do not stack on top of each other. They are applied anew
every time. There are 4 ways to reset a filter: \fI^L\fR, an empty filter
@@ -152,7 +152,7 @@ If
.Nm
is invoked as root the default filter will also match hidden files.
.Pp
-In the \fInavigate-as-you-type mode\fR directories are opened in filter mode,
+In the \fInavigate-as-you-type\fR mode directories are opened in filter mode,
allowing continuous navigation. Works best with the \fBarrow keys\fR.
.Sh ENVIRONMENT
The SHELL, EDITOR and PAGER environment variables take precedence
diff --git a/nnn.c b/nnn.c
index d2740ab..5cf5d25 100644
--- a/nnn.c
+++ b/nnn.c
@@ -1282,7 +1282,7 @@ show_help(void)
o | Open dir in NNN_DE_FILE_MANAGER\n\
p | Open entry in PAGER (fallback less)\n\
^K | Invoke file path copier\n\
- ^L | Force a redraw\n\
+ ^L | Force a redraw, exit filter prompt\n\
? | Toggle help screen\n\
Q | Quit and change directory\n\
q, ^Q | Quit\n\n\" | less");
@@ -2141,7 +2141,7 @@ main(int argc, char *argv[])
fprintf(stdout, "%s\n", VERSION);
return 0;
case 'd':
- fprintf(stderr, "option -d is deprecated, detail view mode is default now.\n");
+ fprintf(stderr, "Option -d is deprecated and will be removed, detail view mode is default now.\n");
break;
case 'h': // fallthrough
default: