Module Name: src
Committed By: christos
Date: Tue Feb 16 14:06:06 UTC 2016
Modified Files:
src/lib/libedit: chared.c chared.h chartype.c common.c el.c el.h
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.h terminal.c terminal.h tty.c tty.h vi.c
Log Message:
cleanup inclusion of histedit.h (Ingo Schwarze)
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libedit/chared.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libedit/chared.h
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/chartype.c
cvs rdiff -u -r1.31 -r1.32 src/lib/libedit/common.c
cvs rdiff -u -r1.77 -r1.78 src/lib/libedit/el.c src/lib/libedit/read.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libedit/el.h
cvs rdiff -u -r1.27 -r1.28 src/lib/libedit/emacs.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libedit/hist.c src/lib/libedit/prompt.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libedit/hist.h
cvs rdiff -u -r1.9 -r1.10 src/lib/libedit/keymacro.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libedit/makelist
cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/map.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libedit/parse.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/prompt.h src/lib/libedit/search.h
cvs rdiff -u -r1.120 -r1.121 src/lib/libedit/readline.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libedit/refresh.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libedit/refresh.h
cvs rdiff -u -r1.33 -r1.34 src/lib/libedit/search.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/sig.h
cvs rdiff -u -r1.18 -r1.19 src/lib/libedit/terminal.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/terminal.h
cvs rdiff -u -r1.51 -r1.52 src/lib/libedit/tty.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libedit/tty.h
cvs rdiff -u -r1.48 -r1.49 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.41 src/lib/libedit/chared.c:1.42
--- src/lib/libedit/chared.c:1.41 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/chared.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.41 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: chared.c,v 1.42 2016/02/16 14:06:05 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.41 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.42 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -45,6 +45,8 @@ __RCSID("$NetBSD: chared.c,v 1.41 2016/0
* chared.c: Character editor utilities
*/
#include <stdlib.h>
+
+#include "histedit.h"
#include "el.h"
private void ch__clearmacro (EditLine *);
Index: src/lib/libedit/chared.h
diff -u src/lib/libedit/chared.h:1.23 src/lib/libedit/chared.h:1.24
--- src/lib/libedit/chared.h:1.23 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/chared.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.23 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: chared.h,v 1.24 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -43,8 +43,6 @@
#include <ctype.h>
#include <string.h>
-#include "histedit.h"
-
#define EL_MAXMACRO 10
/*
Index: src/lib/libedit/chartype.c
diff -u src/lib/libedit/chartype.c:1.14 src/lib/libedit/chartype.c:1.15
--- src/lib/libedit/chartype.c:1.14 Sun Feb 14 09:47:48 2016
+++ src/lib/libedit/chartype.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.14 2016/02/14 14:47:48 christos Exp $ */
+/* $NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -38,8 +38,10 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.14 2016/02/14 14:47:48 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $");
#endif /* not lint && not SCCSID */
+
+#include "histedit.h"
#include "el.h"
#include <stdlib.h>
Index: src/lib/libedit/common.c
diff -u src/lib/libedit/common.c:1.31 src/lib/libedit/common.c:1.32
--- src/lib/libedit/common.c:1.31 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/common.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.31 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,13 +37,14 @@
#if 0
static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: common.c,v 1.31 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
/*
* common.c: Common Editor functions
*/
+#include "histedit.h"
#include "el.h"
/* ed_end_of_file():
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.77 src/lib/libedit/el.c:1.78
--- src/lib/libedit/el.c:1.77 Mon Feb 15 10:53:45 2016
+++ src/lib/libedit/el.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.77 2016/02/15 15:53:45 christos Exp $ */
+/* $NetBSD: el.c,v 1.78 2016/02/16 14:06:05 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.77 2016/02/15 15:53:45 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.78 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -55,6 +55,7 @@ __RCSID("$NetBSD: el.c,v 1.77 2016/02/15
#include <langinfo.h>
#endif
+#include "histedit.h"
#include "el.h"
/* el_init():
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.77 src/lib/libedit/read.c:1.78
--- src/lib/libedit/read.c:1.77 Sun Feb 14 09:47:48 2016
+++ src/lib/libedit/read.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.77 2016/02/14 14:47:48 christos Exp $ */
+/* $NetBSD: read.c,v 1.78 2016/02/16 14:06:05 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.77 2016/02/14 14:47:48 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.78 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: read.c,v 1.77 2016/02/
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
+
+#include "histedit.h"
#include "el.h"
#define OKCMD -1 /* must be -1! */
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.26 src/lib/libedit/el.h:1.27
--- src/lib/libedit/el.h:1.26 Fri Feb 12 10:36:08 2016
+++ src/lib/libedit/el.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.26 2016/02/12 15:36:08 christos Exp $ */
+/* $NetBSD: el.h,v 1.27 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -46,7 +46,6 @@
#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.27 src/lib/libedit/emacs.c:1.28
--- src/lib/libedit/emacs.c:1.27 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/emacs.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emacs.c,v 1.27 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,13 +37,14 @@
#if 0
static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: emacs.c,v 1.27 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
/*
* emacs.c: Emacs functions
*/
+#include "histedit.h"
#include "el.h"
/* em_delete_or_list():
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.34 src/lib/libedit/filecomplete.c:1.35
--- src/lib/libedit/filecomplete.c:1.34 Sat Oct 18 11:07:02 2014
+++ src/lib/libedit/filecomplete.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $ */
+/* $NetBSD: filecomplete.c,v 1.35 2016/02/16 14:06:05 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.34 2014/10/18 15:07:02 riz Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.35 2016/02/16 14:06:05 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -47,9 +47,9 @@ __RCSID("$NetBSD: filecomplete.c,v 1.34
#include <errno.h>
#include <fcntl.h>
+#include "histedit.h"
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
-#include "histedit.h"
#include "filecomplete.h"
static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
Index: src/lib/libedit/hist.c
diff -u src/lib/libedit/hist.c:1.20 src/lib/libedit/hist.c:1.21
--- src/lib/libedit/hist.c:1.20 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/hist.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: hist.c,v 1.21 2016/02/16 14:06:05 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.20 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.21 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -45,6 +45,8 @@ __RCSID("$NetBSD: hist.c,v 1.20 2011/07/
* hist.c: History access functions
*/
#include <stdlib.h>
+
+#include "histedit.h"
#include "el.h"
/* hist_init():
Index: src/lib/libedit/prompt.c
diff -u src/lib/libedit/prompt.c:1.20 src/lib/libedit/prompt.c:1.21
--- src/lib/libedit/prompt.c:1.20 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/prompt.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: prompt.c,v 1.21 2016/02/16 14:06:05 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.20 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: prompt.c,v 1.21 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -45,6 +45,8 @@ __RCSID("$NetBSD: prompt.c,v 1.20 2011/0
* prompt.c: Prompt printing functions
*/
#include <stdio.h>
+
+#include "histedit.h"
#include "el.h"
private Char *prompt_default(EditLine *);
Index: src/lib/libedit/hist.h
diff -u src/lib/libedit/hist.h:1.15 src/lib/libedit/hist.h:1.16
--- src/lib/libedit/hist.h:1.15 Sat Jan 30 10:05:27 2016
+++ src/lib/libedit/hist.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.h,v 1.15 2016/01/30 15:05:27 christos Exp $ */
+/* $NetBSD: hist.h,v 1.16 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_hist
#define _h_el_hist
-#include "histedit.h"
-
typedef int (*hist_fun_t)(void *, TYPE(HistEvent) *, int, ...);
typedef struct el_history_t {
Index: src/lib/libedit/keymacro.c
diff -u src/lib/libedit/keymacro.c:1.9 src/lib/libedit/keymacro.c:1.10
--- src/lib/libedit/keymacro.c:1.9 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/keymacro.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.c,v 1.9 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: keymacro.c,v 1.10 2016/02/16 14:06:05 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.9 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.10 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -66,6 +66,7 @@ __RCSID("$NetBSD: keymacro.c,v 1.9 2016/
#include <string.h>
#include <stdlib.h>
+#include "histedit.h"
#include "el.h"
/*
Index: src/lib/libedit/makelist
diff -u src/lib/libedit/makelist:1.19 src/lib/libedit/makelist:1.20
--- src/lib/libedit/makelist:1.19 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/makelist Tue Feb 16 09:06:05 2016
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: makelist,v 1.19 2016/02/14 14:49:34 christos Exp $
+# $NetBSD: makelist,v 1.20 2016/02/16 14:06:05 christos Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -93,7 +93,9 @@ _EOF
cat $FILES | $AWK '
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
- printf("#include \"config.h\"\n#include \"el.h\"\n");
+ printf("#include \"config.h\"\n");
+ printf("#include \"histedit.h\"\n");
+ printf("#include \"el.h\"\n");
printf("#include \"chartype.h\"\n");
printf("private const struct el_bindings_t el_func_help[] = {\n");
low = "abcdefghijklmnopqrstuvwxyz_";
@@ -175,7 +177,9 @@ _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#include \"el.h\"\n");
+ printf("#include \"config.h\"\n");
+ printf("#include \"histedit.h\"\n");
+ printf("#include \"el.h\"\n");
printf("private const el_func_t el_func[] = {");
maxlen = 80;
needn = 1;
Index: src/lib/libedit/map.c
diff -u src/lib/libedit/map.c:1.37 src/lib/libedit/map.c:1.38
--- src/lib/libedit/map.c:1.37 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/map.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.37 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: map.c,v 1.38 2016/02/16 14:06:05 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.37 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.38 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -45,6 +45,8 @@ __RCSID("$NetBSD: map.c,v 1.37 2016/02/1
* map.c: Editor function definitions
*/
#include <stdlib.h>
+
+#include "histedit.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.29 src/lib/libedit/parse.c:1.30
--- src/lib/libedit/parse.c:1.29 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/parse.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.29 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: parse.c,v 1.30 2016/02/16 14:06:05 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.29 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.30 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -54,9 +54,11 @@ __RCSID("$NetBSD: parse.c,v 1.29 2016/02
* settc
* setty
*/
-#include "el.h"
#include <stdlib.h>
+#include "histedit.h"
+#include "el.h"
+
private const struct {
const Char *name;
int (*func)(EditLine *, int, const Char **);
Index: src/lib/libedit/prompt.h
diff -u src/lib/libedit/prompt.h:1.10 src/lib/libedit/prompt.h:1.11
--- src/lib/libedit/prompt.h:1.10 Wed Dec 30 17:37:40 2009
+++ src/lib/libedit/prompt.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.h,v 1.10 2009/12/30 22:37:40 christos Exp $ */
+/* $NetBSD: prompt.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_prompt
#define _h_el_prompt
-#include "histedit.h"
-
typedef Char *(*el_pfunc_t)(EditLine *);
typedef struct el_prompt_t {
Index: src/lib/libedit/search.h
diff -u src/lib/libedit/search.h:1.10 src/lib/libedit/search.h:1.11
--- src/lib/libedit/search.h:1.10 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/search.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: search.h,v 1.10 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: search.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_search
#define _h_el_search
-#include "histedit.h"
-
typedef struct el_search_t {
Char *patbuf; /* The pattern buffer */
size_t patlen; /* Length of the pattern buffer */
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.120 src/lib/libedit/readline.c:1.121
--- src/lib/libedit/readline.c:1.120 Mon Feb 15 18:36:30 2016
+++ src/lib/libedit/readline.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.120 2016/02/15 23:36:30 christos Exp $ */
+/* $NetBSD: readline.c,v 1.121 2016/02/16 14:06:05 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.120 2016/02/15 23:36:30 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.121 2016/02/16 14:06:05 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -51,9 +51,9 @@ __RCSID("$NetBSD: readline.c,v 1.120 201
#include <vis.h>
#include "readline/readline.h"
+#include "histedit.h"
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
-#include "histedit.h"
#include "filecomplete.h"
void rl_prep_terminal(int);
Index: src/lib/libedit/refresh.c
diff -u src/lib/libedit/refresh.c:1.39 src/lib/libedit/refresh.c:1.40
--- src/lib/libedit/refresh.c:1.39 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/refresh.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.39 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: refresh.c,v 1.40 2016/02/16 14:06:05 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.39 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.40 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -49,6 +49,7 @@ __RCSID("$NetBSD: refresh.c,v 1.39 2016/
#include <unistd.h>
#include <string.h>
+#include "histedit.h"
#include "el.h"
private void re_nextline(EditLine *);
Index: src/lib/libedit/refresh.h
diff -u src/lib/libedit/refresh.h:1.7 src/lib/libedit/refresh.h:1.8
--- src/lib/libedit/refresh.h:1.7 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/refresh.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.h,v 1.7 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: refresh.h,v 1.8 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_refresh
#define _h_el_refresh
-#include "histedit.h"
-
typedef struct {
coord_t r_cursor; /* Refresh cursor position */
int r_oldcv; /* Vertical locations */
Index: src/lib/libedit/search.c
diff -u src/lib/libedit/search.c:1.33 src/lib/libedit/search.c:1.34
--- src/lib/libedit/search.c:1.33 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/search.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.33 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: search.c,v 1.34 2016/02/16 14:06:05 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.33 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.34 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: search.c,v 1.33 2016/0
#elif defined(REGEXP)
#include <regexp.h>
#endif
+
+#include "histedit.h"
#include "el.h"
/*
Index: src/lib/libedit/sig.h
diff -u src/lib/libedit/sig.h:1.8 src/lib/libedit/sig.h:1.9
--- src/lib/libedit/sig.h:1.8 Thu Feb 19 10:20:22 2009
+++ src/lib/libedit/sig.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp $ */
+/* $NetBSD: sig.h,v 1.9 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,8 +42,6 @@
#include <signal.h>
-#include "histedit.h"
-
/*
* Define here all the signals we are going to handle
* The _DO macro is used to iterate in the source code
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.18 src/lib/libedit/terminal.c:1.19
--- src/lib/libedit/terminal.c:1.18 Mon Feb 15 17:53:38 2016
+++ src/lib/libedit/terminal.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.18 2016/02/15 22:53:38 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.19 2016/02/16 14:06:05 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.18 2016/02/15 22:53:38 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.19 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -73,6 +73,7 @@ __RCSID("$NetBSD: terminal.c,v 1.18 2016
#include <pthread.h>
#endif
+#include "histedit.h"
#include "el.h"
/*
Index: src/lib/libedit/terminal.h
diff -u src/lib/libedit/terminal.h:1.5 src/lib/libedit/terminal.h:1.6
--- src/lib/libedit/terminal.h:1.5 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/terminal.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.h,v 1.5 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: terminal.h,v 1.6 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_terminal
#define _h_el_terminal
-#include "histedit.h"
-
typedef struct { /* Symbolic function key bindings */
const Char *name; /* name of the key */
int key; /* Index in termcap table */
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.51 src/lib/libedit/tty.c:1.52
--- src/lib/libedit/tty.c:1.51 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/tty.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.51 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: tty.c,v 1.52 2016/02/16 14:06:05 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.51 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.52 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -49,6 +49,8 @@ __RCSID("$NetBSD: tty.c,v 1.51 2016/02/1
#include <unistd.h> /* for isatty */
#include <strings.h> /* for ffs */
#include <stdlib.h> /* for abort */
+
+#include "histedit.h"
#include "el.h"
#include "tty.h"
Index: src/lib/libedit/tty.h
diff -u src/lib/libedit/tty.h:1.16 src/lib/libedit/tty.h:1.17
--- src/lib/libedit/tty.h:1.16 Tue Feb 16 09:04:24 2016
+++ src/lib/libedit/tty.h Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.16 2016/02/16 14:04:24 christos Exp $ */
+/* $NetBSD: tty.h,v 1.17 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,7 +40,6 @@
#ifndef _h_el_tty
#define _h_el_tty
-#include "histedit.h"
#include <termios.h>
#include <unistd.h>
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.48 src/lib/libedit/vi.c:1.49
--- src/lib/libedit/vi.c:1.48 Sun Feb 14 09:49:34 2016
+++ src/lib/libedit/vi.c Tue Feb 16 09:06:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.48 2016/02/14 14:49:34 christos Exp $ */
+/* $NetBSD: vi.c,v 1.49 2016/02/16 14:06:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,13 +42,14 @@
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vi.c,v 1.48 2016/02/14 14:49:34 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.49 2016/02/16 14:06:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
/*
* vi.c: Vi mode commands.
*/
+#include "histedit.h"
#include "el.h"
private el_action_t cv_action(EditLine *, wint_t);
