complete file names including a ~ correctly.
This commit is contained in:
parent
4bce9043f0
commit
0d78fff152
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: emacs.c,v 1.13 2002/09/25 02:55:03 provos Exp $ */
|
/* $NetBSD: emacs.c,v 1.14 2002/09/27 13:23:55 provos Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Emacs-like command line editing and history
|
* Emacs-like command line editing and history
|
||||||
@ -1798,15 +1798,15 @@ do_complete(flags, type)
|
|||||||
|
|
||||||
olen = end - start;
|
olen = end - start;
|
||||||
nlen = x_longest_prefix(nwords, words);
|
nlen = x_longest_prefix(nwords, words);
|
||||||
/* complete single match, or multi-match without globbing chars */
|
/* complete */
|
||||||
if ((nlen > olen) &&
|
if (nlen > olen) {
|
||||||
((nwords == 1) || (strncmp(words[0], xbuf + start, olen) == 0))) {
|
|
||||||
x_goto(xbuf + start);
|
x_goto(xbuf + start);
|
||||||
x_delete(olen, FALSE);
|
x_delete(olen, FALSE);
|
||||||
x_escape(words[0], nlen, x_emacs_putbuf);
|
x_escape(words[0], nlen, x_emacs_putbuf);
|
||||||
x_adjust();
|
x_adjust();
|
||||||
completed = 1;
|
completed = 1;
|
||||||
}
|
}
|
||||||
|
/* add space if single non-dir match */
|
||||||
if ((nwords == 1) && (!ISDIRSEP(words[0][nlen - 1]))) {
|
if ((nwords == 1) && (!ISDIRSEP(words[0][nlen - 1]))) {
|
||||||
x_ins(space);
|
x_ins(space);
|
||||||
completed = 1;
|
completed = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user