Start synching with NetBSD:

Rename the files key.[hc] to keymacro.[hc] and term.[hc] to terminal.[hc].
The change makes sense because "term.h" conflicts with <term.h>
and the functions key_clear(), key_end(), and key_print() in "key.h"
conflict with macros in <term.h>.
No content change yet, no binary change in *.o after "strip -d".
This reduces the remaining diff from +4634 -3992 to +2640 -1998.
OK czarkoff@, and mmcc@ agrees with the direction.

6 files changed, 17 insertions, 17 deletions

diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 8bcc1236990..1fc5bdddfa3 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2014/10/09 00:30:39 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.15 2016/01/29 17:23:21 schwarze Exp $
 #	$NetBSD: Makefile,v 1.41 2010/02/03 15:34:43 roy Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
@@ -7,8 +7,8 @@ LIB=	edit
 WIDECHAR=	yes
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
-	hist.c key.c map.c chartype.c \
-	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
+	hist.c keymacro.c map.c chartype.c \
+	parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c
 
 MAN=	editline.3 editrc.5
 
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
index 092527d99c8..a54e2e54556 100644
--- a/lib/libedit/el.h
+++ b/lib/libedit/el.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: el.h,v 1.9 2014/10/17 06:07:50 deraadt Exp $	*/
+/*	$OpenBSD: el.h,v 1.10 2016/01/29 17:23:21 schwarze Exp $	*/
 /*	$NetBSD: el.h,v 1.21 2009/12/31 15:58:26 christos Exp $	*/
 
 /*-
@@ -94,8 +94,8 @@ typedef struct el_state_t {
 
 #include "tty.h"
 #include "prompt.h"
-#include "key.h"
-#include "term.h"
+#include "keymacro.h"
+#include "terminal.h"
 #include "refresh.h"
 #include "chared.h"
 #include "common.h"
diff --git a/lib/libedit/key.c b/lib/libedit/keymacro.c
index acf614ee12f..cc577b7f87d 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/keymacro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.12 2014/10/17 06:07:50 deraadt Exp $	*/
+/*	$OpenBSD: keymacro.c,v 1.1 2016/01/29 17:23:21 schwarze Exp $	*/
 /*	$NetBSD: key.c,v 1.23 2009/12/30 22:37:40 christos Exp $	*/
 
 /*-
diff --git a/lib/libedit/key.h b/lib/libedit/keymacro.h
index b6a2780e689..c38f9419517 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/keymacro.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.8 2010/06/30 00:05:35 nicm Exp $	*/
+/*	$OpenBSD: keymacro.h,v 1.1 2016/01/29 17:23:21 schwarze Exp $	*/
 /*	$NetBSD: key.h,v 1.13 2009/12/30 22:37:40 christos Exp $	*/
 
 /*-
@@ -36,10 +36,10 @@
  */
 
 /*
- * el.key.h: Key macro header
+ * el.keymacro.h: Key macro header
  */
-#ifndef _h_el_key
-#define	_h_el_key
+#ifndef _h_el_keymacro
+#define	_h_el_keymacro
 
 typedef union key_value_t {
 	el_action_t	 cmd;	/* If it is a command the #	*/
@@ -78,4 +78,4 @@ protected void	         key_kprint(EditLine *, const Char *, key_value_t *,
 protected size_t	 key__decode_str(const Char *, char *, size_t,
     const char *);
 
-#endif /* _h_el_key */
+#endif /* _h_el_keymacro */
diff --git a/lib/libedit/term.c b/lib/libedit/terminal.c
index cde70db608c..57b5d52c450 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/terminal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.c,v 1.17 2014/10/17 06:07:50 deraadt Exp $	*/
+/*	$OpenBSD: terminal.c,v 1.1 2016/01/29 17:23:21 schwarze Exp $	*/
 /*	$NetBSD: term.c,v 1.57 2009/12/30 22:37:40 christos Exp $	*/
 
 /*-
diff --git a/lib/libedit/term.h b/lib/libedit/terminal.h
index 9eba12e58f5..dbad1adfeb1 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/terminal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.h,v 1.8 2010/06/30 00:05:35 nicm Exp $	*/
+/*	$OpenBSD: terminal.h,v 1.1 2016/01/29 17:23:21 schwarze Exp $	*/
 /*	$NetBSD: term.h,v 1.21 2009/12/30 22:37:40 christos Exp $	*/
 
 /*-
@@ -38,8 +38,8 @@
 /*
  * el.term.h: Termcap header
  */
-#ifndef _h_el_term
-#define	_h_el_term
+#ifndef _h_el_terminal
+#define	_h_el_terminal
 
 #include "histedit.h"
 
@@ -123,4 +123,4 @@ protected void	term__flush(EditLine *);
 #define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
 #define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
 
-#endif /* _h_el_term */
+#endif /* _h_el_terminal */