diff options
| -rwxr-xr-x | build_tools/make_pkg.sh | 7 | ||||
| -rw-r--r-- | fallback.cpp | 20 | ||||
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | osx/config.h | 4 | ||||
| -rw-r--r-- | parse_util.cpp | 6 | ||||
| -rw-r--r-- | user_doc.head.html | 1 |
6 files changed, 14 insertions, 30 deletions
diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh index 1b041bdc..2fb452ea 100755 --- a/build_tools/make_pkg.sh +++ b/build_tools/make_pkg.sh @@ -21,10 +21,3 @@ xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" /tmp/fish_pkg/intermediates/fish.pkg productbuild --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg - - -# Make the app -xcodebuild -scheme fish.app -configuration Release DSTROOT=/tmp/fish_app/ -rm -f ~/fish_built/fish.app.zip -cd DerivedData/fish/Build/Products/Release/ -zip -r ~/fish_built/fish.app.zip fish.app diff --git a/fallback.cpp b/fallback.cpp index f469f257..7e215bbe 100644 --- a/fallback.cpp +++ b/fallback.cpp @@ -1503,20 +1503,14 @@ static int mk_wcwidth(wchar_t ucs) static int mk_wcswidth(const wchar_t *pwcs, size_t n) { - int width = 0; - for (size_t i=0; i < n; i++) - { - if (pwcs[i] == L'\0') - break; + int w, width = 0; + + for (; *pwcs && n-- > 0; pwcs++) + if ((w = mk_wcwidth(*pwcs)) < 0) + return -1; + else + width += w; - int w = mk_wcwidth(pwcs[i]); - if (w < 0) - { - width = -1; - break; - } - width += w; - } return width; } diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index e3815f5a..d1b78d8d 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1190,7 +1190,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1342,7 +1342,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1370,7 +1370,7 @@ "DATADIR=L\\\"/usr/local/share\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", - "FISH_BUILD_VERSION=\\\"2.1.0\\\"", + "FISH_BUILD_VERSION=\\\"2.0.0\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; diff --git a/osx/config.h b/osx/config.h index 4968a78b..9872a2e1 100644 --- a/osx/config.h +++ b/osx/config.h @@ -183,7 +183,7 @@ #define PACKAGE_NAME "fish" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fish 2.1.0" +#define PACKAGE_STRING "fish 2.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "fish" @@ -192,7 +192,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.1.0" +#define PACKAGE_VERSION "2.0.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/parse_util.cpp b/parse_util.cpp index 5d8a1b1d..2f95a3e2 100644 --- a/parse_util.cpp +++ b/parse_util.cpp @@ -260,7 +260,8 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc /* No subshell found, all done */ break; } - /* Interpret NULL to mean the end */ + + /* Intrepret NULL to mean the end */ if (end == NULL) { end = const_cast<wchar_t *>(buff) + bufflen; @@ -272,9 +273,6 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc begin++; ap = begin; bp = end; - /* pos is where to begin looking for the next one. But if we reached the end there's no next one. */ - if (begin >= end) - break; pos = begin + 1; } else if (begin >= cursor) diff --git a/user_doc.head.html b/user_doc.head.html index eae673f5..958a9691 100644 --- a/user_doc.head.html +++ b/user_doc.head.html @@ -19,7 +19,6 @@ body top: 36px; bottom: 0; overflow-y: scroll; - -webkit-overflow-scrolling: touch; /* necessary for momentum scrolling */ } .fish_left_bar |