pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-07 02:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20110715 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2012-01-09 08:23:50 -05:00
parent 74d0116b12
commit 9efb1fb32f
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/readline/isearch.c
+19 -1
View File
@@ -394,6 +394,24 @@ _rl_isearch_dispatch (cxt, c)
rl_execute_next (cxt->prevc);
return (0);
}
/* Otherwise, if the current character is mapped to self-insert (i.e.,
not an editing command), and the previous character was a keymap
index, then we need to insert both the previous character and the
current character into the search string. */
else if (cxt->lastc > 0 && cxt->prevc > 0 &&
cxt->keymap[cxt->prevc].type == ISKMAP &&
cxt->okeymap[cxt->lastc].type == ISFUNC && cxt->okeymap[cxt->lastc].function == rl_insert)
{
/* Make lastc be the next character read */
rl_execute_next (cxt->lastc);
/* Dispatch on the previous character (insert into search string) */
cxt->lastc = cxt->prevc;
/* Have to overwrite cxt->mb here because dispatch uses it below */
cxt->mb[0] = cxt->lastc;
cxt->mb[1] = '\0';
cxt->prevc = 0;
}
}
/* The characters in isearch_terminators (set from the user-settable
@@ -564,7 +582,7 @@ _rl_isearch_dispatch (cxt, c)
}
else
#endif
cxt->search_string[cxt->search_string_index++] = c;
cxt->search_string[cxt->search_string_index++] = cxt->lastc; /* XXX - was c instead of lastc */
cxt->search_string[cxt->search_string_index] = '\0';
break;
}