From fd10c29211dd1bf6780e690975414066f9a1e15c Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 22 Dec 2017 22:10:36 +0800 Subject: [PATCH 1/3] Disable __update_cwd_osx for iTerm.app Fixes #4521. (cherry picked from commit 5faa425df1afe9bb713634bbdbec1e6650eecaf5) --- share/functions/__fish_config_interactive.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index 437605022..b5a623f80 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -262,7 +262,7 @@ function __fish_config_interactive -d "Initializations that should be performed or set -l VTE_VERSION 0 set -q TERM_PROGRAM or set -l TERM_PROGRAM - if test "$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal" -o "$TERM_PROGRAM" = "iTerm.app" + if test "$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal" function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes' if status --is-command-substitution or set -q INSIDE_EMACS From cd5c40ed9c7213e8b1638e923de9613d296c90c1 Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 22 Dec 2017 22:14:55 +0800 Subject: [PATCH 2/3] CHANGELOG: update for 2.7.1 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25f19fc0d..4f41f8959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# fish 2.7.1 (released December 23, 2017) + +This release of fish fixes an issue where iTerm 2 on macOS would display a warning about paste bracketing being left on when starting a new fish session (#4521). + +If you are upgrading from version 2.6.0 or before, please also review the release notes for 2.7.0 and 2.7b1 (included below). + +-- + # fish 2.7.0 (released November 23, 2017) There are no major changes between 2.7b1 and 2.7.0. If you are upgrading from version 2.6.0 or before, please also review the release notes for 2.7b1 (included below). From b680db8ce683db285c750ae5af534c97d08b1b40 Mon Sep 17 00:00:00 2001 From: David Adam Date: Sat, 23 Dec 2017 00:16:29 +0800 Subject: [PATCH 3/3] Bump version for 2.7.1 --- osx/Info.plist | 2 +- osx/config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osx/Info.plist b/osx/Info.plist index 31f4bd21c..34611fc82 100644 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.7.0 + 2.7.1 CFBundleVersion 0.1 LSApplicationCategoryType diff --git a/osx/config.h b/osx/config.h index 442195855..8ecf25eea 100644 --- a/osx/config.h +++ b/osx/config.h @@ -200,7 +200,7 @@ #define PACKAGE_NAME "fish" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fish 2.7.0" +#define PACKAGE_STRING "fish 2.7.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "fish" @@ -209,7 +209,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.7.0" +#define PACKAGE_VERSION "2.7.1" /* The size of `wchar_t', as computed by sizeof. */ #define SIZEOF_WCHAR_T 4