merged 5.0-bugteam to 5.1-bugteam

cmd-line-utils/libedit/Makefile.am

@@ -21,7 +21,7 @@ pkginclude_HEADERS =	readline/readline.h
 
 noinst_HEADERS =	chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \
 			sys.h config.h hist.h map.h prompt.h read.h \
-			search.h tty.h filecomplete.h
+			search.h tty.h filecomplete.h np/vis.h
 
 EXTRA_DIST = makelist.sh
 

cmd-line-utils/libedit/term.c

@@ -50,9 +50,11 @@ static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#if 0 /* TODO: do we need this */
 #ifdef HAVE_TERMCAP_H
 #include <termcap.h>
 #endif
+#endif
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif