diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-07-20 20:39:31 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-07-20 20:39:31 -0700 |
| commit | b08fb866378693d2e75f17fdfe5e60401a29136a (patch) | |
| tree | ad1eb00129b96d284ab9ed4ca2de1cc176219777 /highlight.h | |
| parent | b290fd33b973e573ffc7fc0c87be3ab431678b5f (diff) | |
Renamed env_vars to env_vars_snapshot_t
Cleanup of non-wcstring version of path_get_path
Diffstat (limited to 'highlight.h')
| -rw-r--r-- | highlight.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/highlight.h b/highlight.h index 7e30fe08..6ad19dfa 100644 --- a/highlight.h +++ b/highlight.h @@ -83,7 +83,7 @@ struct file_detection_context_t; \param pos the cursor position. Used for quote matching, etc. \param error a list in which a description of each error will be inserted. May be 0, in whcich case no error descriptions will be generated. */ -void highlight_shell( const wcstring &buffstr, std::vector<int> &color, int pos, wcstring_list_t *error, const env_vars &vars ); +void highlight_shell( const wcstring &buffstr, std::vector<int> &color, int pos, wcstring_list_t *error, const env_vars_snapshot_t &vars ); /** Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are highlighted. The result is @@ -95,7 +95,7 @@ void highlight_shell( const wcstring &buffstr, std::vector<int> &color, int pos, \param pos the cursor position. Used for quote matching, etc. \param error a list in which a description of each error will be inserted. May be 0, in whcich case no error descriptions will be generated. */ -void highlight_universal( const wcstring &buffstr, std::vector<int> &color, int pos, wcstring_list_t *error, const env_vars &vars ); +void highlight_universal( const wcstring &buffstr, std::vector<int> &color, int pos, wcstring_list_t *error, const env_vars_snapshot_t &vars ); /** Translate from HIGHLIGHT_* to FISH_COLOR_* according to environment @@ -112,7 +112,7 @@ rgb_color_t highlight_get_color( int highlight, bool is_background ); /** Given a command 'str' from the history, try to determine whether we ought to suggest it by specially recognizing the command. Returns true if we validated the command. If so, returns by reference whether the suggestion is valid or not. */ -bool autosuggest_validate_from_history(const history_item_t &item, file_detection_context_t &detector, const wcstring &working_directory, const env_vars &vars); +bool autosuggest_validate_from_history(const history_item_t &item, file_detection_context_t &detector, const wcstring &working_directory, const env_vars_snapshot_t &vars); /** Given the command line contents 'str', return via reference a suggestion by specially recognizing the command. The suggestion is escaped. Returns true if we recognized the command (even if we couldn't think of a suggestion for it). */ |