diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /bash/bash-2.05b/bash205b-003.patch | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'bash/bash-2.05b/bash205b-003.patch')
| -rw-r--r-- | bash/bash-2.05b/bash205b-003.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/bash/bash-2.05b/bash205b-003.patch b/bash/bash-2.05b/bash205b-003.patch index e69de29bb2..020248b873 100644 --- a/bash/bash-2.05b/bash205b-003.patch +++ b/bash/bash-2.05b/bash205b-003.patch @@ -0,0 +1,39 @@ +*** ../bash-2.05b/bashline.c Tue May 7 15:52:42 2002 +--- bashline.c Sat Aug 3 11:40:16 2002 +*************** +*** 1045,1049 **** +--- 1045,1052 ---- + else + { ++ #define CMD_IS_DIR(x) (absolute_pathname(x) == 0 && *(x) != '~' && test_for_directory (x)) ++ + matches = rl_completion_matches (text, command_word_completion_function); ++ + /* If we are attempting command completion and nothing matches, we + do not want readline to perform filename completion for us. We +*************** +*** 1053,1057 **** + if (matches == (char **)NULL) + rl_ignore_some_completions_function = bash_ignore_filenames; +! else if (matches[1] == 0 && *matches[0] != '/') + /* Turn off rl_filename_completion_desired so readline doesn't + append a slash if there is a directory with the same name +--- 1056,1060 ---- + if (matches == (char **)NULL) + rl_ignore_some_completions_function = bash_ignore_filenames; +! else if (matches[1] == 0 && CMD_IS_DIR(matches[0])) + /* Turn off rl_filename_completion_desired so readline doesn't + append a slash if there is a directory with the same name +*************** +*** 1062,1066 **** + conflict. */ + rl_filename_completion_desired = 0; +! else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && *matches[0] != '/') + /* There are multiple instances of the same match (duplicate + completions haven't yet been removed). In this case, all of +--- 1065,1069 ---- + conflict. */ + rl_filename_completion_desired = 0; +! else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && CMD_IS_DIR (matches[0])) + /* There are multiple instances of the same match (duplicate + completions haven't yet been removed). In this case, all of |