bzr commit into mysql-6.0-bugteam branch (patrick.crews:3042)

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/bug_fixes/mysql-6.0-bugteam/ based on revid:patrick.crews@stripped

 3042 Patrick Crews	2009-02-10 [merge]
      merge
modified:
  cmd-line-utils/libedit/Makefile.am
  cmd-line-utils/libedit/term.c

=== modified file 'cmd-line-utils/libedit/Makefile.am'
--- a/cmd-line-utils/libedit/Makefile.am	2009-02-10 14:54:02 +0000
+++ b/cmd-line-utils/libedit/Makefile.am	2009-02-10 19:14:49 +0000
@@ -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
 

=== modified file 'cmd-line-utils/libedit/term.c'
--- a/cmd-line-utils/libedit/term.c	2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/term.c	2009-02-10 18:19:03 +0000
@@ -50,9 +50,11 @@ static char sccsid[] = "@(#)term.c	8.2 (
 #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