[src/trunk]: src/lib/libedit cleanup inclusion of histedit.h (Ingo Schwarze)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/951cd3cc586c
branches:  trunk
changeset: 343604:951cd3cc586c
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Feb 16 14:06:05 2016 +0000

description:
cleanup inclusion of histedit.h (Ingo Schwarze)

diffstat:

 lib/libedit/chared.c       |   6 ++++--
 lib/libedit/chared.h       |   4 +---
 lib/libedit/chartype.c     |   6 ++++--
 lib/libedit/common.c       |   5 +++--
 lib/libedit/el.c           |   5 +++--
 lib/libedit/el.h           |   3 +--
 lib/libedit/emacs.c        |   5 +++--
 lib/libedit/filecomplete.c |   6 +++---
 lib/libedit/hist.c         |   6 ++++--
 lib/libedit/hist.h         |   4 +---
 lib/libedit/keymacro.c     |   5 +++--
 lib/libedit/makelist       |  10 +++++++---
 lib/libedit/map.c          |   6 ++++--
 lib/libedit/parse.c        |   8 +++++---
 lib/libedit/prompt.c       |   6 ++++--
 lib/libedit/prompt.h       |   4 +---
 lib/libedit/read.c         |   6 ++++--
 lib/libedit/readline.c     |   6 +++---
 lib/libedit/refresh.c      |   5 +++--
 lib/libedit/refresh.h      |   4 +---
 lib/libedit/search.c       |   6 ++++--
 lib/libedit/search.h       |   4 +---
 lib/libedit/sig.h          |   4 +---
 lib/libedit/terminal.c     |   5 +++--
 lib/libedit/terminal.h     |   4 +---
 lib/libedit/tty.c          |   6 ++++--
 lib/libedit/tty.h          |   3 +--
 lib/libedit/vi.c           |   5 +++--
 28 files changed, 80 insertions(+), 67 deletions(-)

diffs (truncated from 669 to 300 lines):

diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/chared.c
--- a/lib/libedit/chared.c      Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/chared.c      Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
  * chared.c: Character editor utilities
  */
 #include <stdlib.h>
+
+#include "histedit.h"
 #include "el.h"
 
 private void ch__clearmacro (EditLine *);
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/chared.h
--- a/lib/libedit/chared.h      Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/chared.h      Tue Feb 16 14:06:05 2016 +0000
@@ -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
 
 /*
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/chartype.c
--- a/lib/libedit/chartype.c    Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/chartype.c    Tue Feb 16 14:06:05 2016 +0000
@@ -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>
 
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/common.c
--- a/lib/libedit/common.c      Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/common.c      Tue Feb 16 14:06:05 2016 +0000
@@ -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():
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/el.c
--- a/lib/libedit/el.c  Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/el.c  Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
 #include <langinfo.h>
 #endif
 
+#include "histedit.h"
 #include "el.h"
 
 /* el_init():
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/el.h
--- a/lib/libedit/el.h  Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/el.h  Tue Feb 16 14:06:05 2016 +0000
@@ -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>
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/emacs.c
--- a/lib/libedit/emacs.c       Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/emacs.c       Tue Feb 16 14:06:05 2016 +0000
@@ -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():
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/filecomplete.c
--- a/lib/libedit/filecomplete.c        Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/filecomplete.c        Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
 #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', '"', '\\', '\'', '`', '@',
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/hist.c
--- a/lib/libedit/hist.c        Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/hist.c        Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
  * hist.c: History access functions
  */
 #include <stdlib.h>
+
+#include "histedit.h"
 #include "el.h"
 
 /* hist_init():
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/hist.h
--- a/lib/libedit/hist.h        Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/hist.h        Tue Feb 16 14:06:05 2016 +0000
@@ -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 {
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/keymacro.c
--- a/lib/libedit/keymacro.c    Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/keymacro.c    Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "histedit.h"
 #include "el.h"
 
 /*
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/makelist
--- a/lib/libedit/makelist      Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/makelist      Tue Feb 16 14:06:05 2016 +0000
@@ -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 @@
     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 @@
     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;
diff -r cb71011f2ab3 -r 951cd3cc586c lib/libedit/map.c
--- a/lib/libedit/map.c Tue Feb 16 14:04:58 2016 +0000
+++ b/lib/libedit/map.c Tue Feb 16 14:06:05 2016 +0000
@@ -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