diff options
author | Tom Hinton <t@larkery.com> | 2015-10-05 10:38:17 +0100 |
---|---|---|
committer | Tom Hinton <t@larkery.com> | 2015-10-05 10:44:11 +0100 |
commit | a53061b8903b640d218f8d4b20dc3f42f26b13c2 (patch) | |
tree | dc97eac0e195df2a7a81d3011cc885881bda2fac /include | |
parent | c2d8cb1f45f3f592a87223cae5e2c495bb204934 (diff) | |
parent | 77cdc8d7c4aab103d4ac1252cfe1653e14c914a4 (diff) |
Merge remote-tracking branch 'upstream/master' into fast-ascii-filtering
Conflicts:
source/dialogs/dmenu.c
source/helper.c
source/rofi.c
Diffstat (limited to 'include')
-rw-r--r-- | include/rofi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rofi.h b/include/rofi.h index 1aff2350..cfc6ebc8 100644 --- a/include/rofi.h +++ b/include/rofi.h @@ -210,8 +210,6 @@ typedef struct _Settings unsigned int fixed_num_lines; /** Do not use history */ unsigned int disable_history; - /** Use levenshtein sorting when matching */ - unsigned int levenshtein_sort; /** Search case sensitivity */ unsigned int case_sensitive; /** Separator to use for dmenu mode */ @@ -230,6 +228,8 @@ typedef struct _Settings char *combi_modi; /** Fuzzy match */ unsigned int fuzzy; + unsigned int glob; + unsigned int tokenize; /** Monitors */ int monitor; /** Line margin */ |