unix-filename-rubout uses forward slashes too

mridgers · May 18, 2023 · d82ad89 · d82ad89
1 parent 52a9299
commit d82ad89
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/readline/readline.patch b/readline/readline.patch
@@ -325,3 +325,31 @@ index 3ed21cc..03bcbde 100644
    matches = *matchesp;
 
    if (matches == 0)
+diff --git a/readline/readline/kill.c b/readline/readline/kill.c
+index 1a78783f..ad7df09e 100644
+--- a/readline/readline/kill.c
++++ b/readline/readline/kill.c
+@@ -362,13 +362,21 @@ rl_unix_filename_rubout (count, key)
+       while (count--)
+ 	{
+ 	  c = rl_line_buffer[rl_point - 1];
+-	  while (rl_point && (whitespace (c) || c == '/'))
++/* begin_clink_change
++ * Treat forward-slashes as path separators too
++ */
++	  while (rl_point && (whitespace (c) || c == '/' || c == '\\'))
++/* end_clink_change */
+ 	    {
+ 	      rl_point--;
+ 	      c = rl_line_buffer[rl_point - 1];
+ 	    }
+
+-	  while (rl_point && (whitespace (c) == 0) && c != '/')
++/* begin_clink_change
++ * Treat forward-slashes as path separators too
++ */
++	  while (rl_point && (whitespace (c) == 0) && c != '/' && c != '\\')
++/* end_clink_change */
+ 	    {
+ 	      rl_point--;
+ 	      c = rl_line_buffer[rl_point - 1];
diff --git a/readline/readline/kill.c b/readline/readline/kill.c
@@ -362,13 +362,21 @@ rl_unix_filename_rubout (count, key)
       while (count--)
 	{
 	  c = rl_line_buffer[rl_point - 1];
-	  while (rl_point && (whitespace (c) || c == '/'))
+/* begin_clink_change
+ * Treat forward-slashes as path separators too
+ */
+	  while (rl_point && (whitespace (c) || c == '/' || c == '\\'))
+/* end_clink_change */
 	    {
 	      rl_point--;
 	      c = rl_line_buffer[rl_point - 1];
 	    }
 
-	  while (rl_point && (whitespace (c) == 0) && c != '/')
+/* begin_clink_change
+ * Treat forward-slashes as path separators too
+ */
+	  while (rl_point && (whitespace (c) == 0) && c != '/' && c != '\\')
+/* end_clink_change */
 	    {
 	      rl_point--;
 	      c = rl_line_buffer[rl_point - 1];