-diff -u -r ../fish-2.1.1/complete.cpp ./complete.cpp
+diff -u -r ../fish-2.1.1/complete.cpp ./src/complete.cpp
--- ../fish-2.1.1/complete.cpp 2014-09-24 05:51:07.000000000 -0400
-+++ ./complete.cpp 2015-02-05 17:43:46.010415990 -0500
++++ ./src/complete.cpp 2015-02-05 17:43:46.010415990 -0500
@@ -1731,6 +1731,9 @@
*/
bool completer_t::try_complete_user(const wcstring &str)