From: Chet Ramey <chet.ramey@case.edu>
Date: Thu, 24 Nov 2011 00:24:53 +0000 (-0500)
Subject: Readline-6.1.002 import
X-Git-Tag: readline-6.3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdd796540cf235ad4b5d4a892570aba697c7fb61;p=thirdparty%2Freadline.git

Readline-6.1.002 import
---

diff --git a/complete.c b/complete.c
index ad9ca05..bda2204 100644
--- a/complete.c
+++ b/complete.c
@@ -2138,7 +2138,7 @@ rl_filename_completion_function (text, state)
 	 All other entries except "." and ".." match. */
       if (filename_len == 0)
 	{
-	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
+	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
 	    continue;
 
 	  if (convfn[0] != '.' ||
@@ -2219,7 +2219,7 @@ rl_filename_completion_function (text, state)
 		temp[dirlen++] = '/';
 	    }
 
-	  strcpy (temp + dirlen, entry->d_name);
+	  strcpy (temp + dirlen, convfn);
 	}
       else
 	temp = savestring (convfn);
diff --git a/patchlevel b/patchlevel
index d8c9df7..7cbda82 100644
--- a/patchlevel
+++ b/patchlevel
@@ -1,3 +1,3 @@
 # Do not edit -- exists only for use by patch
 
-0
+2
diff --git a/readline.h b/readline.h
index 7a4ffaa..8a8d45a 100644
--- a/readline.h
+++ b/readline.h
@@ -39,9 +39,9 @@ extern "C" {
 #endif
 
 /* Hex-encoded Readline version number. */
-#define RL_READLINE_VERSION	0x0600		/* Readline 6.0 */
+#define RL_READLINE_VERSION	0x0601		/* Readline 6.1 */
 #define RL_VERSION_MAJOR	6
-#define RL_VERSION_MINOR	0
+#define RL_VERSION_MINOR	1
 
 /* Readline data structures. */