diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2014-01-15 02:05:46 -0800 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-01-15 02:05:46 -0800 |
commit | 54689f60874d46391d9da613ff1305a974a3de24 (patch) | |
tree | e4cbc0727267ce18d0101b46acba0f62ac0b0928 /highlight.h | |
parent | 5953170f142a6cccd0d8f7e5af08c70f18f42689 (diff) | |
parent | 370b47d23f3cfde3e385c2268adb95229f0f7ed7 (diff) |
Merge branch 'master' into pager
Conflicts:
highlight.h
Diffstat (limited to 'highlight.h')
-rw-r--r-- | highlight.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/highlight.h b/highlight.h index bd439e88..9b191a78 100644 --- a/highlight.h +++ b/highlight.h @@ -28,23 +28,22 @@ enum highlight_spec_quote, //quoted string highlight_spec_redirection, //redirection highlight_spec_autosuggestion, //autosuggestion - + // Pager support highlight_spec_pager_prefix, highlight_spec_pager_completion, highlight_spec_pager_description, highlight_spec_pager_progress, highlight_spec_pager_secondary, - - + HIGHLIGHT_SPEC_PRIMARY_MASK = 0xFF, - + /* The following values are modifiers */ highlight_modifier_valid_path = 0x100, - + /* Very special value */ highlight_spec_invalid = 0xFFFF - + }; typedef uint32_t highlight_spec_t; |