bzr push into mysql-5.1 branch (nirbhay.choubey:3631 to 3632) WL#5945

[Nirbhay Choubey]

 3632 Nirbhay Choubey	2011-10-24
      WL#5945 - Improve libedit library
      
      Fixed a misplaced parenthesis, injected due to
      syncing from libedit CVS head.

    modified:
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
 3631 Nirbhay Choubey	2011-10-21
      Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY"
                   BREAKS SOURCE RELEASE BUILD
      
      Some of the required files were not getting copied while
      performing 'make dist' and hence the build failed for
      the created distribution source.
      
      Added the missing files to Makefile.am.

    modified:
      cmd-line-utils/libedit/Makefile.am
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/terminal.c
=== modified file 'cmd-line-utils/libedit/README'
--- a/cmd-line-utils/libedit/README	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/README	2011-10-24 08:05:28 +0000
@@ -42,7 +42,7 @@ then merge remaining bits by hand.  All 
 marked with XXXMYSQL to make them easier to identify and merge.  To generate
 a 'clean' diff against upstream you can use the above commands but use
 
-	cvs co -D "2011/10/04 15:27:04" [..]
+	cvs co -D "2011/10/23 17:37:55" [..]
 
 to fetch the baseline of most recent merge.
 

=== modified file 'cmd-line-utils/libedit/chared.c'
--- a/cmd-line-utils/libedit/chared.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/chared.c	2011-10-24 08:05:28 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.35 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.36 2011/10/23 17:37:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -200,7 +200,7 @@ c_delbefore1(EditLine *el)
 protected int
 ce__isword(Int p)
 {
-	return Isalnum(p || Strchr(STR("*?_-.[]~="), p) != NULL);
+        return Isalnum(p) || Strchr(STR("*?_-.[]~="), p) != NULL;
 }
 
 

No bundle (reason: useless for push emails).