Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/gwsw/less
Browse files Browse the repository at this point in the history
  • Loading branch information
gwsw committed Dec 29, 2021
2 parents 24dea15 + 30c1fb4 commit 74678a9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions cmdbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -861,9 +861,10 @@ cmd_edit(c)
flags |= ECF_NOHISTORY;
#endif
#if TAB_COMPLETE_FILENAME
if (curr_mlist == ml_search)
if (curr_mlist == ml_search || curr_mlist == NULL)
/*
* In a search command; don't accept file-completion cmds.
* Don't accept file-completion cmds in contexts
* such as search pattern, digits, long option name, etc.
*/
flags |= ECF_NOCOMPLETE;
#endif
Expand Down
2 changes: 1 addition & 1 deletion forwback.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ forw(n, pos, force, only_last, nblank)
else
{
overlay_header();
lower_left();
/* lower_left(); {{ considered harmful? }} */
}
first_time = 0;
(void) currline(BOTTOM);
Expand Down
6 changes: 3 additions & 3 deletions lesskey.nro.VER
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'\" t
.TH LESSKEY 1 "Version @@VERSION@@: @@DATE@@"
.SH NAME
lesskey \- specify key bindings for less
lesskey \- customize key bindings for less
.SH "SYNOPSIS (deprecated)"
.B "lesskey [\-o output] [\-\-] [input]"
.br
Expand Down Expand Up @@ -42,9 +42,9 @@ The input file consists of one or more
Each section starts with a line that identifies the type of section.
Possible sections are:
.IP #command
Defines new command keys.
Customizes command key bindings.
.IP #line-edit
Defines new line-editing keys.
Customizes line-editing key bindings.
.IP #env
Defines environment variables.
.PP
Expand Down

0 comments on commit 74678a9

Please sign in to comment.