Cfg: fixing matching configuration names #309

dvorka · Aug 26, 2018 · 7d6a6b0 · 7d6a6b0
1 parent 32ccdab
commit 7d6a6b0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -70,7 +70,7 @@ or ensure black and white mode:
 export HH_CONFIG=monochromatic
 ```
 
-## History View
+## Default History View
 Show normal history by default (instead of metrics-based view):
 
 ```bash
@@ -84,13 +84,33 @@ export HH_CONFIG=favorites-view
 ```
 
 ## Filtering
+To use regular expressions based matching:
+
+```bash
+export HH_CONFIG=regexp-matching
+```
+
+To use substring based matching:
+
+```bash
+export HH_CONFIG=substring-matching
+```
+
+To use keywords (substrings whose order doesn't matter) search matching (default):
+
+```bash
+export HH_CONFIG=keywords-matching
+```
+
+---
+
 Make search case sensitive (insensitive by default):
 
 ```bash
-export HH_CONFIG=casesensitive
+export HH_CONFIG=case-sensitive
 ```
 
-Keep duplicates in `rawhistory` view (duplicates discarded by default):
+Keep duplicates in `raw-history-view` (duplicate commands are discarded by default):
 
 ```bash
 export HH_CONFIG=duplicates

diff --git a/man/hstr.1 b/man/hstr.1
@@ -99,13 +99,13 @@ Configuration options:
 \fInoconfirm\fR
         Do not ask for confirmation on a history entry delete (default is with confirmation).
 
-\fIregexp\fR
+\fIregexp-matching\fR
         Filter command history using regular expressions. 
 
-\fIsubstring\fR
+\fIsubstring-matching\fR
         Filter command history using substring.
 
-\fIkeywords\fR
+\fIkeywords-matching\fR
         Filter command history using keywords - item matches if contains all keywords in pattern in any order (keywords match is default).
 
 \fIcasesensitive\fR

diff --git a/src/hstr.c b/src/hstr.c
@@ -75,9 +75,9 @@
 #define HSTR_CONFIG_FAVORITES         "favorites-view"
 #define HSTR_CONFIG_SORTING           "raw-history-view"
 #define HSTR_CONFIG_CASE              "casesensitive"
-#define HSTR_CONFIG_REGEXP            "regexp"
-#define HSTR_CONFIG_SUBSTRING         "substring"
-#define HSTR_CONFIG_KEYWORDS          "keywords"
+#define HSTR_CONFIG_REGEXP            "regexp-matching"
+#define HSTR_CONFIG_SUBSTRING         "substring-matching"
+#define HSTR_CONFIG_KEYWORDS          "keywords-matching"
 #define HSTR_CONFIG_NOCONFIRM         "noconfirm"
 #define HSTR_CONFIG_VERBOSE_KILL      "verbose-kill"
 #define HSTR_CONFIG_PROMPT_BOTTOM     "prompt-bottom"