Merge branch 'Integration_2.7.1'

CHANGELOG.md

@@ -9,7 +9,6 @@ This section is for changes merged to the `major` branch that are not also merge
 - `read` now requires at least one var name (#4220).
 - `set x[1] x[2] a b` is no longer valid syntax (#4236).
 - For loop control variables are no longer local to the for block (#1935).
-- A message related to bracketed paste has been worked around by disabling $PWD reporting for iTerm (#4575).
 
 ## Notable fixes and improvements
 - `wait` builtin is added for waiting on processes (#4498).
@@ -39,6 +38,14 @@ This section is for changes merged to the `major` branch that are not also merge
 
 --
 
+# 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).

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-git"
+#define PACKAGE_STRING "fish 2.7.1-git"
 
 /* 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-git"
+#define PACKAGE_VERSION "2.7.1-git"
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4