Bump version for 2.7.1

Fixes #4521.

(cherry picked from commit 5faa425df1)

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 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).
+
+Xcode builds and macOS packages could not be produced with 2.7b1, but this is fixed in 2.7.0.
+
+--
+
 # fish 2.7b1 (released October 31, 2017)
 
 ## Notable improvements

fish.xcodeproj/project.pbxproj

@@ -202,6 +202,7 @@
 		D012436B1CD4019700C64313 /* fallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0A0853E13B3ACEE0099B651 /* fallback.cpp */; };
 		D01A2D24169B736200767098 /* man1 in Copy Files */ = {isa = PBXBuildFile; fileRef = D01A2D23169B730A00767098 /* man1 */; };
 		D01A2D25169B737700767098 /* man1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = D01A2D23169B730A00767098 /* man1 */; };
+		D02DE6831FB2CD5E0049D8D8 /* builtin_argparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB0F034A1F156FE3001827D3 /* builtin_argparse.cpp */; };
 		D030FBEF1A4A382000F7ADA0 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0A0854A13B3ACEE0099B651 /* input.cpp */; };
 		D030FBF01A4A382B00F7ADA0 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0A0853B13B3ACEE0099B651 /* event.cpp */; };
 		D030FBF11A4A384000F7ADA0 /* output.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0A0855113B3ACEE0099B651 /* output.cpp */; };
@@ -1561,6 +1562,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D001B5EE1F041CBD000838CC /* builtin.cpp in Sources */,
+				D02DE6831FB2CD5E0049D8D8 /* builtin_argparse.cpp in Sources */,
 				D001B5F01F041CBD000838CC /* builtin_ulimit.cpp in Sources */,
 				D001B5F21F041CBD000838CC /* builtin_test.cpp in Sources */,
 				D001B5F41F041CBD000838CC /* builtin_string.cpp in Sources */,

osx/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.900</string>
+	<string>2.7.1</string>
 	<key>CFBundleVersion</key>
 	<string>0.1</string>
 	<key>LSApplicationCategoryType</key>

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

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

share/functions/fish_opt.fish

@@ -17,7 +17,7 @@ function fish_opt -d 'Produce an option specification suitable for use with `arg
     or return
 
     if set -q _flag_help
-        __fish_print_help nextd
+        __fish_print_help fish_opt
         return 0
     end