summaryrefslogtreecommitdiffstats
path: root/lib/libedit/filecomplete.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2016-01-30 00:06:39 +0000
committerschwarze <schwarze@openbsd.org>2016-01-30 00:06:39 +0000
commitfd40972a32cae034e619460a2b6f83c3492db0ca (patch)
tree72798d3d835644ba0a1c63eade7f249cf5f8e482 /lib/libedit/filecomplete.c
parentwhitespace fixes; ok ajacoutot (diff)
downloadwireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.tar.xz
wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.zip
Third step in synching with NetBSD:
* rename fkey_t to funckey_t and el_term_t to el_terminal_t * rename struct editline member el_term to el_terminal * rename many functions in terminal.c from term_*() to terminal_*(), for consistency with the file name and to not look related to <term.h> No functional change. This makes refresh.c and sig.c almost identical to the NetBSD versions. It reduces the remaining diff from +2446 -1805 to +2053 -1420. OK czarkoff@
Diffstat (limited to 'lib/libedit/filecomplete.c')
-rw-r--r--lib/libedit/filecomplete.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c
index 5eda39113c6..c6c2000fed6 100644
--- a/lib/libedit/filecomplete.c
+++ b/lib/libedit/filecomplete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filecomplete.c,v 1.4 2014/10/17 06:07:50 deraadt Exp $ */
+/* $OpenBSD: filecomplete.c,v 1.5 2016/01/30 00:06:39 schwarze Exp $ */
/* $NetBSD: filecomplete.c,v 1.22 2010/12/02 04:42:46 dholland Exp $ */
/*-
@@ -349,7 +349,7 @@ void
fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
{
size_t line, lines, col, cols, thisguy;
- int screenwidth = el->el_term.t_size.h;
+ int screenwidth = el->el_terminal.t_size.h;
/* Ignore matches[0]. Avoid 1-based array logic below. */
matches++;