bzr push into mysql-5.0-bugteam branch (joro:2739 to 2740)

[Georgi Kodinov]

 2740 Georgi Kodinov	2009-02-10
      fixed a libedit compilation problem
      modified:
        cmd-line-utils/libedit/Makefile.am
        cmd-line-utils/libedit/term.c

 2739 Georgi Kodinov	2009-02-10
      From jperkin :  Merge libedit 2.11 and related files, 
      based on NetBSD CVS as of 2009/02/06 20:09:00.
      removed:
        cmd-line-utils/libedit/TEST/
        cmd-line-utils/libedit/TEST/test.c
        cmd-line-utils/libedit/compat.h
        cmd-line-utils/libedit/compat_conf.h
        cmd-line-utils/libedit/editline.3
        cmd-line-utils/libedit/editrc.5
        cmd-line-utils/libedit/fgetln.c
        cmd-line-utils/libedit/fgetln.h
        cmd-line-utils/libedit/libedit_term.h
        cmd-line-utils/libedit/strlcpy.c
        cmd-line-utils/libedit/strlcpy.h
        cmd-line-utils/libedit/tokenizer.h
        cmd-line-utils/libedit/unvis.c
        cmd-line-utils/libedit/vis.c
        cmd-line-utils/libedit/vis.h
      added:
        cmd-line-utils/libedit/README
        cmd-line-utils/libedit/filecomplete.c
        cmd-line-utils/libedit/filecomplete.h
      modified:
        client/mysql.cc
        cmd-line-utils/libedit/Makefile.am
        cmd-line-utils/libedit/chared.c
        cmd-line-utils/libedit/chared.h
        cmd-line-utils/libedit/common.c
        cmd-line-utils/libedit/config.h
        cmd-line-utils/libedit/el.c
        cmd-line-utils/libedit/el.h
        cmd-line-utils/libedit/el_term.h
        cmd-line-utils/libedit/emacs.c
        cmd-line-utils/libedit/hist.c
        cmd-line-utils/libedit/histedit.h
        cmd-line-utils/libedit/history.c
        cmd-line-utils/libedit/key.c
        cmd-line-utils/libedit/key.h
        cmd-line-utils/libedit/makelist.sh
        cmd-line-utils/libedit/map.c
        cmd-line-utils/libedit/np/fgetln.c
        cmd-line-utils/libedit/np/strlcat.c
        cmd-line-utils/libedit/np/strlcpy.c
        cmd-line-utils/libedit/np/unvis.c
        cmd-line-utils/libedit/np/vis.c
        cmd-line-utils/libedit/np/vis.h
        cmd-line-utils/libedit/parse.c
        cmd-line-utils/libedit/parse.h
        cmd-line-utils/libedit/prompt.c
        cmd-line-utils/libedit/read.c
        cmd-line-utils/libedit/read.h
        cmd-line-utils/libedit/readline.c
        cmd-line-utils/libedit/readline/readline.h
        cmd-line-utils/libedit/refresh.c
        cmd-line-utils/libedit/search.c
        cmd-line-utils/libedit/sig.c
        cmd-line-utils/libedit/sig.h
        cmd-line-utils/libedit/sys.h
        cmd-line-utils/libedit/term.c
        cmd-line-utils/libedit/tokenizer.c
        cmd-line-utils/libedit/tty.c
        cmd-line-utils/libedit/tty.h
        cmd-line-utils/libedit/vi.c

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