Readline-6.1.002 import

diff --git a/complete.c b/complete.c
index ad9ca051586faa858be7e7f2558c7212ca616c44..bda22048a22e30b29b9e50b32a3d9f27fcd98bed 100644 (file)
--- 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 d8c9df7e6bb19b63a7c7f1c4f192a91529e40699..7cbda82ded86fa174ee44dba637d5fa80815bfdc 100644 (file)
--- 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 7a4ffaa5832ff0599140a7910fb3978f389d2b01..8a8d45a1b54b15e594575ddeaa7615a926924cda 100644 (file)
--- 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. */