Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for error messages when loading completions

Browse source
This commit is contained in:
ridiculousfish 2012-02-26 01:15:53 -08:00
parent 38e40862fe
commit 94a764d6ea
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
env.cpp
View file

@ -1151,7 +1151,7 @@ env_var_t env_get_string( const wcstring &key )
{ {
if( res->val == ENV_NULL ) if( res->val == ENV_NULL )
{ {
return wcstring(L""); return env_var_t::missing_var();
} }
else else
{ {

10
env.h
View file

@ -100,6 +100,7 @@ private:
bool is_missing; bool is_missing;
public: public:
static env_var_t missing_var(void); static env_var_t missing_var(void);
env_var_t(const env_var_t &x) : wcstring(x), is_missing(x.is_missing) { }
env_var_t(const wcstring & x) : wcstring(x), is_missing(false) { } env_var_t(const wcstring & x) : wcstring(x), is_missing(false) { }
env_var_t(const wchar_t *x) : wcstring(x), is_missing(false) { } env_var_t(const wchar_t *x) : wcstring(x), is_missing(false) { }
env_var_t() : wcstring(L""), is_missing(false) { } env_var_t() : wcstring(L""), is_missing(false) { }
@ -111,6 +112,15 @@ public:
wcstring::operator=(s); wcstring::operator=(s);
return *this; return *this;
} }
bool operator==(const env_var_t &s) const {
if (is_missing && s.is_missing)
return true;
else if (s.is_missing || s.is_missing)
return false;
else
return *static_cast<const wcstring *>(this) == *static_cast<const wcstring *>(&s);
}
}; };
/** /**