Changeset 5094:097deb080af0

Timestamp:

2007-04-07 15:08:44 (20 months ago)

Author:

Michael Elkins <me@…>

Branch:

HEAD

Message:

"complete" function should consider shell chars to be word boundaries when doing filename completion (bug #2871)

Files:

• enter.c (modified) (2 diffs)

enter.c

@@ -188 +188 @@
 
 /*
+ * Return 1 if the character is not typically part of a pathname
+ */
+inline int is_shell_char(wchar_t ch)
+{
+  static wchar_t shell_chars[] = L"<>&()$?*;{} "; /* ! not included because it can be part of a pathname in Mutt */
+  return wcschr(shell_chars, ch) != NULL;
+}
+
+/*
  * Returns:
  *      1 need to redraw the screen and call me again
@@ -478 +487 @@
           if (flags & M_CMD)
           {
-            for (i = state->curpos; i && state->wbuf[i-1] != ' '; i--)
+            for (i = state->curpos; i && !is_shell_char(state->wbuf[i-1]); i--)
               ;
             my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);