From: Francois Fleuret Date: Tue, 19 May 2009 16:32:17 +0000 (+0200) Subject: Fixed the bash prefix deletion, added the ESC key to abort. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=c95741cdde744c87f121d4ee128d0e42ab37bee2;p=selector.git Fixed the bash prefix deletion, added the ESC key to abort. --- diff --git a/selector.cc b/selector.cc index 7b51ce3..8c17dc1 100644 --- a/selector.cc +++ b/selector.cc @@ -582,8 +582,10 @@ void read_file(const char *input_filename, // Remove the bash history prefix - if(bash_history && (*t == ' ' || (*t >= '0' && *t <= '9'))) { - while(*t == ' ' || (*t >= '0' && *t <= '9')) t++; + if(bash_history) { + while(*t == ' ') t++; + while(*t >= '0' && *t <= '9') t++; + while(*t == ' ') t++; } // Copy the string while transforming the ctrl characters into @@ -961,7 +963,10 @@ int main(int argc, char **argv) { update_screen(¤t_line, &temporary_line, motion, nb_lines, lines, cursor_position, pattern); - } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G + } while(key != '\007' && // ^G + key != '\033' && // ^[ (escape) + key != '\n' && + key != KEY_ENTER); echo(); endwin();