diff options
| author | christos <christos@NetBSD.org> | 2016-02-16 15:53:48 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-02-16 15:53:48 +0000 |
| commit | af0ffa531c48e0833e330607caa18360fc09fc9a (patch) | |
| tree | 2be65e167191442b9c5a367fa99555f4d9b4fc09 /lib/libedit | |
| parent | 7a82ed4a7d78cfb213d3da53cafd833ea5a38040 (diff) | |
From Ingo Scharze:
Let "el.h" include everything needed for struct editline,
and don't include that stuff multiple times. That also improves
consistency, also avoids circular inclusions, and also makes it
easier to follow what is going on, even though not quite as nice.
But it seems like the best we can do...
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/chared.c | 7 | ||||
| -rw-r--r-- | lib/libedit/chared.h | 2 | ||||
| -rw-r--r-- | lib/libedit/chartype.c | 10 | ||||
| -rw-r--r-- | lib/libedit/common.c | 6 | ||||
| -rw-r--r-- | lib/libedit/el.c | 6 | ||||
| -rw-r--r-- | lib/libedit/el.h | 4 | ||||
| -rw-r--r-- | lib/libedit/eln.c | 10 | ||||
| -rw-r--r-- | lib/libedit/emacs.c | 6 | ||||
| -rw-r--r-- | lib/libedit/filecomplete.c | 6 | ||||
| -rw-r--r-- | lib/libedit/hist.c | 7 | ||||
| -rw-r--r-- | lib/libedit/hist.h | 2 | ||||
| -rw-r--r-- | lib/libedit/keymacro.c | 6 | ||||
| -rw-r--r-- | lib/libedit/makelist | 12 | ||||
| -rw-r--r-- | lib/libedit/map.c | 7 | ||||
| -rw-r--r-- | lib/libedit/parse.c | 9 | ||||
| -rw-r--r-- | lib/libedit/prompt.c | 7 | ||||
| -rw-r--r-- | lib/libedit/prompt.h | 2 | ||||
| -rw-r--r-- | lib/libedit/read.c | 7 | ||||
| -rw-r--r-- | lib/libedit/readline.c | 6 | ||||
| -rw-r--r-- | lib/libedit/refresh.c | 6 | ||||
| -rw-r--r-- | lib/libedit/refresh.h | 2 | ||||
| -rw-r--r-- | lib/libedit/search.c | 7 | ||||
| -rw-r--r-- | lib/libedit/search.h | 2 | ||||
| -rw-r--r-- | lib/libedit/sig.c | 10 | ||||
| -rw-r--r-- | lib/libedit/sig.h | 2 | ||||
| -rw-r--r-- | lib/libedit/terminal.c | 6 | ||||
| -rw-r--r-- | lib/libedit/terminal.h | 2 | ||||
| -rw-r--r-- | lib/libedit/tty.c | 7 | ||||
| -rw-r--r-- | lib/libedit/tty.h | 2 | ||||
| -rw-r--r-- | lib/libedit/vi.c | 6 |
30 files changed, 59 insertions, 115 deletions
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c index 1007fc25be6..603a885b453 100644 --- a/lib/libedit/chared.c +++ b/lib/libedit/chared.c @@ -1,4 +1,4 @@ -/* $NetBSD: chared.c,v 1.43 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: chared.c,v 1.44 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: chared.c,v 1.43 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: chared.c,v 1.44 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,9 +45,6 @@ __RCSID("$NetBSD: chared.c,v 1.43 2016/02/16 14:08:25 christos Exp $"); * chared.c: Character editor utilities */ #include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" private void ch__clearmacro (EditLine *); diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h index 44acdcf995e..f9a7ad42631 100644 --- a/lib/libedit/chared.h +++ b/lib/libedit/chared.h @@ -1,4 +1,4 @@ -/* $NetBSD: chared.h,v 1.24 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: chared.h,v 1.25 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/chartype.c b/lib/libedit/chartype.c index a64046d602d..8bbc86c0c29 100644 --- a/lib/libedit/chartype.c +++ b/lib/libedit/chartype.c @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.c,v 1.16 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: chartype.c,v 1.17 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -38,14 +38,10 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: chartype.c,v 1.16 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: chartype.c,v 1.17 2016/02/16 15:53:48 christos Exp $"); #endif /* not lint && not SCCSID */ - -#include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" +#include <stdlib.h> #define CT_BUFSIZ ((size_t)1024) diff --git a/lib/libedit/common.c b/lib/libedit/common.c index a6d4d930a91..3fed9e6e896 100644 --- a/lib/libedit/common.c +++ b/lib/libedit/common.c @@ -1,4 +1,4 @@ -/* $NetBSD: common.c,v 1.33 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: common.c,v 1.34 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,15 +37,13 @@ #if 0 static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: common.c,v 1.33 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: common.c,v 1.34 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * common.c: Common Editor functions */ -#include "histedit.h" -#include "chartype.h" #include "el.h" /* ed_end_of_file(): diff --git a/lib/libedit/el.c b/lib/libedit/el.c index 183debcf9d8..9c14ce84653 100644 --- a/lib/libedit/el.c +++ b/lib/libedit/el.c @@ -1,4 +1,4 @@ -/* $NetBSD: el.c,v 1.79 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: el.c,v 1.80 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #else -__RCSID("$NetBSD: el.c,v 1.79 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: el.c,v 1.80 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -55,8 +55,6 @@ __RCSID("$NetBSD: el.c,v 1.79 2016/02/16 14:08:25 christos Exp $"); #include <langinfo.h> #endif -#include "histedit.h" -#include "chartype.h" #include "el.h" /* el_init(): diff --git a/lib/libedit/el.h b/lib/libedit/el.h index 63ce995d0ed..bc366e0f20e 100644 --- a/lib/libedit/el.h +++ b/lib/libedit/el.h @@ -1,4 +1,4 @@ -/* $NetBSD: el.h,v 1.28 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: el.h,v 1.29 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -46,6 +46,8 @@ #define VIDEFAULT #define ANCHOR +#include "histedit.h" +#include "chartype.h" #include <stdio.h> #include <sys/types.h> diff --git a/lib/libedit/eln.c b/lib/libedit/eln.c index 6443d173078..7df6572a82f 100644 --- a/lib/libedit/eln.c +++ b/lib/libedit/eln.c @@ -1,4 +1,4 @@ -/* $NetBSD: eln.c,v 1.24 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: eln.c,v 1.25 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -34,18 +34,16 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: eln.c,v 1.24 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: eln.c,v 1.25 2016/02/16 15:53:48 christos Exp $"); #endif /* not lint && not SCCSID */ -#include "histedit.h" -#include "chartype.h" -#include "el.h" -#include "read.h" #include <errno.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include "el.h" + public int el_getc(EditLine *el, char *cp) { diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c index 4d72356cb28..495277e2215 100644 --- a/lib/libedit/emacs.c +++ b/lib/libedit/emacs.c @@ -1,4 +1,4 @@ -/* $NetBSD: emacs.c,v 1.29 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: emacs.c,v 1.30 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,15 +37,13 @@ #if 0 static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: emacs.c,v 1.29 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: emacs.c,v 1.30 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * emacs.c: Emacs functions */ -#include "histedit.h" -#include "chartype.h" #include "el.h" /* em_delete_or_list(): diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c index bc547cc356d..cbd5ef70893 100644 --- a/lib/libedit/filecomplete.c +++ b/lib/libedit/filecomplete.c @@ -1,4 +1,4 @@ -/* $NetBSD: filecomplete.c,v 1.36 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: filecomplete.c,v 1.37 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: filecomplete.c,v 1.36 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: filecomplete.c,v 1.37 2016/02/16 15:53:48 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -47,8 +47,6 @@ __RCSID("$NetBSD: filecomplete.c,v 1.36 2016/02/16 14:08:25 christos Exp $"); #include <errno.h> #include <fcntl.h> -#include "histedit.h" -#include "chartype.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "filecomplete.h" diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c index 7430f33eb6f..69bef2f548f 100644 --- a/lib/libedit/hist.c +++ b/lib/libedit/hist.c @@ -1,4 +1,4 @@ -/* $NetBSD: hist.c,v 1.22 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: hist.c,v 1.23 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: hist.c,v 1.22 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: hist.c,v 1.23 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,9 +45,6 @@ __RCSID("$NetBSD: hist.c,v 1.22 2016/02/16 14:08:25 christos Exp $"); * hist.c: History access functions */ #include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" /* hist_init(): diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h index 3fe54d8e4a8..e9a042a606a 100644 --- a/lib/libedit/hist.h +++ b/lib/libedit/hist.h @@ -1,4 +1,4 @@ -/* $NetBSD: hist.h,v 1.16 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: hist.h,v 1.17 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/keymacro.c b/lib/libedit/keymacro.c index f87d4eaf80a..88b7fbd5f69 100644 --- a/lib/libedit/keymacro.c +++ b/lib/libedit/keymacro.c @@ -1,4 +1,4 @@ -/* $NetBSD: keymacro.c,v 1.11 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: keymacro.c,v 1.12 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: keymacro.c,v 1.11 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: keymacro.c,v 1.12 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -66,8 +66,6 @@ __RCSID("$NetBSD: keymacro.c,v 1.11 2016/02/16 14:08:25 christos Exp $"); #include <string.h> #include <stdlib.h> -#include "histedit.h" -#include "chartype.h" #include "el.h" /* diff --git a/lib/libedit/makelist b/lib/libedit/makelist index 56de2167d03..f299f0a9ddb 100644 --- a/lib/libedit/makelist +++ b/lib/libedit/makelist @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: makelist,v 1.21 2016/02/16 14:08:25 christos Exp $ +# $NetBSD: makelist,v 1.22 2016/02/16 15:53:48 christos Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -93,10 +93,7 @@ _EOF cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"config.h\"\n"); - printf("#include \"histedit.h\"\n"); - printf("#include \"chartype.h\"\n"); - printf("#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; @@ -177,10 +174,7 @@ _EOF cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"config.h\"\n"); - printf("#include \"histedit.h\"\n"); - printf("#include \"chartype.h\"\n"); - printf("#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; diff --git a/lib/libedit/map.c b/lib/libedit/map.c index 49741d28846..d31e7b161e2 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1,4 +1,4 @@ -/* $NetBSD: map.c,v 1.39 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: map.c,v 1.40 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: map.c,v 1.39 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: map.c,v 1.40 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,9 +45,6 @@ __RCSID("$NetBSD: map.c,v 1.39 2016/02/16 14:08:25 christos Exp $"); * map.c: Editor function definitions */ #include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" private void map_print_key(EditLine *, el_action_t *, const Char *); diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c index cb4e060b14c..1c4bcdf4ab4 100644 --- a/lib/libedit/parse.c +++ b/lib/libedit/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.31 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: parse.c,v 1.32 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: parse.c,v 1.31 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.32 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -54,11 +54,8 @@ __RCSID("$NetBSD: parse.c,v 1.31 2016/02/16 14:08:25 christos Exp $"); * settc * setty */ -#include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" +#include <stdlib.h> private const struct { const Char *name; diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c index cbc38bc4ef7..ccb1737600a 100644 --- a/lib/libedit/prompt.c +++ b/lib/libedit/prompt.c @@ -1,4 +1,4 @@ -/* $NetBSD: prompt.c,v 1.22 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: prompt.c,v 1.23 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: prompt.c,v 1.22 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: prompt.c,v 1.23 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,9 +45,6 @@ __RCSID("$NetBSD: prompt.c,v 1.22 2016/02/16 14:08:25 christos Exp $"); * prompt.c: Prompt printing functions */ #include <stdio.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" private Char *prompt_default(EditLine *); diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h index 5ae7e0aa167..060ec8ff754 100644 --- a/lib/libedit/prompt.h +++ b/lib/libedit/prompt.h @@ -1,4 +1,4 @@ -/* $NetBSD: prompt.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: prompt.h,v 1.12 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 59dddf75188..90179b75676 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.79 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: read.c,v 1.80 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: read.c,v 1.79 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: read.c,v 1.80 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -50,9 +50,6 @@ __RCSID("$NetBSD: read.c,v 1.79 2016/02/16 14:08:25 christos Exp $"); #include <unistd.h> #include <stdlib.h> #include <limits.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" #define OKCMD -1 /* must be -1! */ diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 23930717dad..3c7e39b1a0a 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.122 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: readline.c,v 1.123 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.122 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.123 2016/02/16 15:53:48 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -51,8 +51,6 @@ __RCSID("$NetBSD: readline.c,v 1.122 2016/02/16 14:08:25 christos Exp $"); #include <vis.h> #include "readline/readline.h" -#include "histedit.h" -#include "chartype.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "filecomplete.h" diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c index fb9ed990aa5..06969515d9d 100644 --- a/lib/libedit/refresh.c +++ b/lib/libedit/refresh.c @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.41 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: refresh.c,v 1.42 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: refresh.c,v 1.41 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.42 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -49,8 +49,6 @@ __RCSID("$NetBSD: refresh.c,v 1.41 2016/02/16 14:08:25 christos Exp $"); #include <unistd.h> #include <string.h> -#include "histedit.h" -#include "chartype.h" #include "el.h" private void re_nextline(EditLine *); diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h index a9743cbc411..498af415dc9 100644 --- a/lib/libedit/refresh.h +++ b/lib/libedit/refresh.h @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.h,v 1.8 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: refresh.h,v 1.9 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/search.c b/lib/libedit/search.c index c4408d9cb12..b135f040854 100644 --- a/lib/libedit/search.c +++ b/lib/libedit/search.c @@ -1,4 +1,4 @@ -/* $NetBSD: search.c,v 1.35 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: search.c,v 1.36 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: search.c,v 1.35 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: search.c,v 1.36 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -50,9 +50,6 @@ __RCSID("$NetBSD: search.c,v 1.35 2016/02/16 14:08:25 christos Exp $"); #elif defined(REGEXP) #include <regexp.h> #endif - -#include "histedit.h" -#include "chartype.h" #include "el.h" /* diff --git a/lib/libedit/search.h b/lib/libedit/search.h index 3c45b73787b..4fff962ba1c 100644 --- a/lib/libedit/search.h +++ b/lib/libedit/search.h @@ -1,4 +1,4 @@ -/* $NetBSD: search.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: search.h,v 1.12 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c index acdb16e4054..66af04a3387 100644 --- a/lib/libedit/sig.c +++ b/lib/libedit/sig.c @@ -1,4 +1,4 @@ -/* $NetBSD: sig.c,v 1.21 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: sig.c,v 1.22 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: sig.c,v 1.21 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: sig.c,v 1.22 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -46,12 +46,8 @@ __RCSID("$NetBSD: sig.c,v 1.21 2016/02/16 14:08:25 christos Exp $"); * our policy is to trap all signals, set a good state * and pass the ball to our caller. */ -#include <errno.h> -#include <stdlib.h> - -#include "histedit.h" -#include "chartype.h" #include "el.h" +#include <stdlib.h> private EditLine *sel = NULL; diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h index dde0f99348c..caf360a0a91 100644 --- a/lib/libedit/sig.h +++ b/lib/libedit/sig.h @@ -1,4 +1,4 @@ -/* $NetBSD: sig.h,v 1.9 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: sig.h,v 1.10 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/terminal.c b/lib/libedit/terminal.c index 95a1db3c8e6..64bd8cee45a 100644 --- a/lib/libedit/terminal.c +++ b/lib/libedit/terminal.c @@ -1,4 +1,4 @@ -/* $NetBSD: terminal.c,v 1.20 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: terminal.c,v 1.21 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95"; #else -__RCSID("$NetBSD: terminal.c,v 1.20 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: terminal.c,v 1.21 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -73,8 +73,6 @@ __RCSID("$NetBSD: terminal.c,v 1.20 2016/02/16 14:08:25 christos Exp $"); #include <pthread.h> #endif -#include "histedit.h" -#include "chartype.h" #include "el.h" /* diff --git a/lib/libedit/terminal.h b/lib/libedit/terminal.h index d004cf3eb0f..e1b0a809892 100644 --- a/lib/libedit/terminal.h +++ b/lib/libedit/terminal.h @@ -1,4 +1,4 @@ -/* $NetBSD: terminal.h,v 1.6 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: terminal.h,v 1.7 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 026b9418380..54a077f2d00 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.53 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: tty.c,v 1.54 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tty.c,v 1.53 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: tty.c,v 1.54 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -50,10 +50,7 @@ __RCSID("$NetBSD: tty.c,v 1.53 2016/02/16 14:08:25 christos Exp $"); #include <strings.h> /* for ffs */ #include <stdlib.h> /* for abort */ -#include "histedit.h" -#include "chartype.h" #include "el.h" -#include "tty.h" typedef struct ttymodes_t { const char *m_name; diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h index c5b0f0fe8b8..22b7bed3beb 100644 --- a/lib/libedit/tty.h +++ b/lib/libedit/tty.h @@ -1,4 +1,4 @@ -/* $NetBSD: tty.h,v 1.17 2016/02/16 14:06:05 christos Exp $ */ +/* $NetBSD: tty.h,v 1.18 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c index 7dee83ce658..92f584a45ac 100644 --- a/lib/libedit/vi.c +++ b/lib/libedit/vi.c @@ -1,4 +1,4 @@ -/* $NetBSD: vi.c,v 1.50 2016/02/16 14:08:25 christos Exp $ */ +/* $NetBSD: vi.c,v 1.51 2016/02/16 15:53:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -42,15 +42,13 @@ #if 0 static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: vi.c,v 1.50 2016/02/16 14:08:25 christos Exp $"); +__RCSID("$NetBSD: vi.c,v 1.51 2016/02/16 15:53:48 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * vi.c: Vi mode commands. */ -#include "histedit.h" -#include "chartype.h" #include "el.h" private el_action_t cv_action(EditLine *, wint_t); |
