From cbee09d3edf6ada10197acf59b0243271d31c3c0 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Mon, 17 May 2010 08:17:17 +0200 Subject: [PATCH] Added the --bash option. --- selector.1 | 3 +++ selector.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/selector.1 b/selector.1 index 84ac24b..95d83a2 100644 --- a/selector.1 +++ b/selector.1 @@ -90,6 +90,9 @@ make a flash instead of a beep when there is an edition error \fB--\fR, \fB--rest-are-files\fR state that all following arguments are filenames .TP +\fB--bash\fR +standard setting for bash history search, same as as -b -i -d -v -w +.TP \fB-t \fI\fR, \fB--title \fI<title>\fR add a title in the modeline .TP diff --git a/selector.c b/selector.c index a404087..041de4c 100644 --- a/selector.c +++ b/selector.c @@ -43,6 +43,7 @@ #include <regex.h> #include <locale.h> #include <getopt.h> +#include <limits.h> #define VERSION "1.1.1" @@ -189,6 +190,8 @@ void usage(FILE *out) { fprintf(out, " monochrome mode\n"); fprintf(out, " -q, --no-beep\n"); fprintf(out, " make a flash instead of a beep on an edition error\n"); + fprintf(out, " --bash\n"); + fprintf(out, " setting for bash history search, same as -b -i -d -v -w\n"); fprintf(out, " --, --rest-are-files\n"); fprintf(out, " all following arguments are filenames\n"); fprintf(out, " -t <title>, --title <title>\n"); @@ -806,6 +809,13 @@ void read_file(struct hash_table_t *hash_table, /*********************************************************************/ +/* For long options that have no equivalent short option, use a + non-character as a pseudo short option, starting with CHAR_MAX + 1. */ +enum +{ + OPT_BASH_MODE = CHAR_MAX + 1 +}; + static struct option long_options[] = { { "output-file", 1, 0, 'o' }, { "pattern-separator", 1, 0, 's' }, @@ -824,6 +834,7 @@ static struct option long_options[] = { { "number-of-lines", 1, 0, 'l' }, { "colors", 1, 0, 'c' }, { "rest-are-files", no_argument, 0, '-' }, + { "bash", no_argument, 0, OPT_BASH_MODE }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } }; @@ -945,6 +956,21 @@ int main(int argc, char **argv) { show_help = 1; break; + case OPT_BASH_MODE: + /* Same as -c 7,4,0,3 -q */ + /* color_fg_modeline = 7; */ + /* color_bg_modeline = 4; */ + /* color_fg_highlight = 0; */ + /* color_bg_highlight = 3; */ + /* error_flash = 1; */ + /* Same as -b -i -d -v -w */ + bash_history = 1; + inverse_order = 1; + remove_duplicates = 1; + output_to_vt_buffer = 1; + add_control_qs = 1; + break; + default: error = 1; break; -- 2.20.1