Removed an unused parameter in previous_visible().

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index a404087..8f2296b 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -25,7 +25,7 @@
 /*
 
   To use it as a super-history-search for bash:
-  selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
+  selector --bash -l ${HISTSIZE} <(history)
 
 */
 
@@ -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");
@@ -425,8 +428,7 @@ void kill_after_cursor(char *buffer, int *position) {
 
 /*********************************************************************/
 
-int previous_visible(int current_line, int nb_lines, char **lines,
-                     matcher_t *matcher) {
+int previous_visible(int current_line, char **lines, matcher_t *matcher) {
   int line = current_line - 1;
   while(line >= 0 && !match(lines[line], matcher)) line--;
   return line;
@@ -499,8 +501,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
                                     &matcher);
       if(new_focus_line < 0) {
-        new_focus_line = previous_visible(*current_focus_line, nb_lines, lines,
-                                          &matcher);
+        new_focus_line = previous_visible(*current_focus_line, lines, &matcher);
       }
     }
 
@@ -519,7 +520,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       } else {
         /* We want to go up, let's find the first visible line above */
         for(m = 0; l >= 0 && m < -motion; m++) {
-          l = previous_visible(l, nb_lines, lines, &matcher);
+          l = previous_visible(l, lines, &matcher);
           if(l >= 0) {
             new_focus_line = l;
           }
@@ -806,6 +807,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 +832,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 +954,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;