Module Name: src
Committed By: christos
Date: Tue Feb 16 15:53:48 UTC 2016
Modified Files:
src/lib/libedit: chared.c chared.h chartype.c common.c el.c el.h eln.c
emacs.c filecomplete.c hist.c hist.h keymacro.c makelist map.c
parse.c prompt.c prompt.h read.c readline.c refresh.c refresh.h
search.c search.h sig.c sig.h terminal.c terminal.h tty.c tty.h
vi.c
Log Message:
>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...
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libedit/chared.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libedit/chared.h src/lib/libedit/eln.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libedit/chartype.c src/lib/libedit/hist.h
cvs rdiff -u -r1.33 -r1.34 src/lib/libedit/common.c
cvs rdiff -u -r1.79 -r1.80 src/lib/libedit/el.c src/lib/libedit/read.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libedit/el.h
cvs rdiff -u -r1.29 -r1.30 src/lib/libedit/emacs.c
cvs rdiff -u -r1.36 -r1.37 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libedit/hist.c src/lib/libedit/prompt.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libedit/keymacro.c \
src/lib/libedit/prompt.h src/lib/libedit/search.h
cvs rdiff -u -r1.21 -r1.22 src/lib/libedit/makelist src/lib/libedit/sig.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libedit/map.c
cvs rdiff -u -r1.31 -r1.32 src/lib/libedit/parse.c
cvs rdiff -u -r1.122 -r1.123 src/lib/libedit/readline.c
cvs rdiff -u -r1.41 -r1.42 src/lib/libedit/refresh.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/refresh.h
cvs rdiff -u -r1.35 -r1.36 src/lib/libedit/search.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libedit/sig.h
cvs rdiff -u -r1.20 -r1.21 src/lib/libedit/terminal.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/terminal.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libedit/tty.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libedit/tty.h
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.43 src/lib/libedit/chared.c:1.44
--- src/lib/libedit/chared.c:1.43 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/chared.c Tue Feb 16 10:53:48 2016
@@ -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/0
* chared.c: Character editor utilities
*/
#include <stdlib.h>
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
private void ch__clearmacro (EditLine *);
Index: src/lib/libedit/chared.h
diff -u src/lib/libedit/chared.h:1.24 src/lib/libedit/chared.h:1.25
--- src/lib/libedit/chared.h:1.24 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/chared.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.24 src/lib/libedit/eln.c:1.25
--- src/lib/libedit/eln.c:1.24 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/eln.c Tue Feb 16 10:53:48 2016
@@ -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)
{
Index: src/lib/libedit/chartype.c
diff -u src/lib/libedit/chartype.c:1.16 src/lib/libedit/chartype.c:1.17
--- src/lib/libedit/chartype.c:1.16 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/chartype.c Tue Feb 16 10:53:48 2016
@@ -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)
Index: src/lib/libedit/hist.h
diff -u src/lib/libedit/hist.h:1.16 src/lib/libedit/hist.h:1.17
--- src/lib/libedit/hist.h:1.16 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/hist.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/common.c
diff -u src/lib/libedit/common.c:1.33 src/lib/libedit/common.c:1.34
--- src/lib/libedit/common.c:1.33 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/common.c Tue Feb 16 10:53:48 2016
@@ -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():
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.79 src/lib/libedit/el.c:1.80
--- src/lib/libedit/el.c:1.79 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/el.c Tue Feb 16 10:53:48 2016
@@ -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
#include <langinfo.h>
#endif
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
/* el_init():
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.79 src/lib/libedit/read.c:1.80
--- src/lib/libedit/read.c:1.79 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/read.c Tue Feb 16 10:53:48 2016
@@ -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/
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
#define OKCMD -1 /* must be -1! */
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.28 src/lib/libedit/el.h:1.29
--- src/lib/libedit/el.h:1.28 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/el.h Tue Feb 16 10:53:48 2016
@@ -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>
Index: src/lib/libedit/emacs.c
diff -u src/lib/libedit/emacs.c:1.29 src/lib/libedit/emacs.c:1.30
--- src/lib/libedit/emacs.c:1.29 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/emacs.c Tue Feb 16 10:53:48 2016
@@ -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():
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.36 src/lib/libedit/filecomplete.c:1.37
--- src/lib/libedit/filecomplete.c:1.36 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/filecomplete.c Tue Feb 16 10:53:48 2016
@@ -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
#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"
Index: src/lib/libedit/hist.c
diff -u src/lib/libedit/hist.c:1.22 src/lib/libedit/hist.c:1.23
--- src/lib/libedit/hist.c:1.22 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/hist.c Tue Feb 16 10:53:48 2016
@@ -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/
* hist.c: History access functions
*/
#include <stdlib.h>
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
/* hist_init():
Index: src/lib/libedit/prompt.c
diff -u src/lib/libedit/prompt.c:1.22 src/lib/libedit/prompt.c:1.23
--- src/lib/libedit/prompt.c:1.22 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/prompt.c Tue Feb 16 10:53:48 2016
@@ -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/0
* prompt.c: Prompt printing functions
*/
#include <stdio.h>
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
private Char *prompt_default(EditLine *);
Index: src/lib/libedit/keymacro.c
diff -u src/lib/libedit/keymacro.c:1.11 src/lib/libedit/keymacro.c:1.12
--- src/lib/libedit/keymacro.c:1.11 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/keymacro.c Tue Feb 16 10:53:48 2016
@@ -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
#include <string.h>
#include <stdlib.h>
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
/*
Index: src/lib/libedit/prompt.h
diff -u src/lib/libedit/prompt.h:1.11 src/lib/libedit/prompt.h:1.12
--- src/lib/libedit/prompt.h:1.11 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/prompt.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/search.h
diff -u src/lib/libedit/search.h:1.11 src/lib/libedit/search.h:1.12
--- src/lib/libedit/search.h:1.11 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/search.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/makelist
diff -u src/lib/libedit/makelist:1.21 src/lib/libedit/makelist:1.22
--- src/lib/libedit/makelist:1.21 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/makelist Tue Feb 16 10:53:48 2016
@@ -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;
Index: src/lib/libedit/sig.c
diff -u src/lib/libedit/sig.c:1.21 src/lib/libedit/sig.c:1.22
--- src/lib/libedit/sig.c:1.21 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/sig.c Tue Feb 16 10:53:48 2016
@@ -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/1
* 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;
Index: src/lib/libedit/map.c
diff -u src/lib/libedit/map.c:1.39 src/lib/libedit/map.c:1.40
--- src/lib/libedit/map.c:1.39 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/map.c Tue Feb 16 10:53:48 2016
@@ -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/1
* 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 *);
Index: src/lib/libedit/parse.c
diff -u src/lib/libedit/parse.c:1.31 src/lib/libedit/parse.c:1.32
--- src/lib/libedit/parse.c:1.31 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/parse.c Tue Feb 16 10:53:48 2016
@@ -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
* settc
* setty
*/
-#include <stdlib.h>
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
+#include <stdlib.h>
private const struct {
const Char *name;
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.122 src/lib/libedit/readline.c:1.123
--- src/lib/libedit/readline.c:1.122 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/readline.c Tue Feb 16 10:53:48 2016
@@ -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 201
#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"
Index: src/lib/libedit/refresh.c
diff -u src/lib/libedit/refresh.c:1.41 src/lib/libedit/refresh.c:1.42
--- src/lib/libedit/refresh.c:1.41 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/refresh.c Tue Feb 16 10:53:48 2016
@@ -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/
#include <unistd.h>
#include <string.h>
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
private void re_nextline(EditLine *);
Index: src/lib/libedit/refresh.h
diff -u src/lib/libedit/refresh.h:1.8 src/lib/libedit/refresh.h:1.9
--- src/lib/libedit/refresh.h:1.8 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/refresh.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/search.c
diff -u src/lib/libedit/search.c:1.35 src/lib/libedit/search.c:1.36
--- src/lib/libedit/search.c:1.35 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/search.c Tue Feb 16 10:53:48 2016
@@ -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/0
#elif defined(REGEXP)
#include <regexp.h>
#endif
-
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
/*
Index: src/lib/libedit/sig.h
diff -u src/lib/libedit/sig.h:1.9 src/lib/libedit/sig.h:1.10
--- src/lib/libedit/sig.h:1.9 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/sig.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.20 src/lib/libedit/terminal.c:1.21
--- src/lib/libedit/terminal.c:1.20 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/terminal.c Tue Feb 16 10:53:48 2016
@@ -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
#include <pthread.h>
#endif
-#include "histedit.h"
-#include "chartype.h"
#include "el.h"
/*
Index: src/lib/libedit/terminal.h
diff -u src/lib/libedit/terminal.h:1.6 src/lib/libedit/terminal.h:1.7
--- src/lib/libedit/terminal.h:1.6 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/terminal.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.53 src/lib/libedit/tty.c:1.54
--- src/lib/libedit/tty.c:1.53 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/tty.c Tue Feb 16 10:53:48 2016
@@ -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/1
#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;
Index: src/lib/libedit/tty.h
diff -u src/lib/libedit/tty.h:1.17 src/lib/libedit/tty.h:1.18
--- src/lib/libedit/tty.h:1.17 Tue Feb 16 09:06:05 2016
+++ src/lib/libedit/tty.h Tue Feb 16 10:53:48 2016
@@ -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
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.50 src/lib/libedit/vi.c:1.51
--- src/lib/libedit/vi.c:1.50 Tue Feb 16 09:08:25 2016
+++ src/lib/libedit/vi.c Tue Feb 16 10:53:48 2016
@@ -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);
