Merge branch 'Integration_2.3.0'

3 files changed, 58 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7e7272..d3189e8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# fish 2.3.0 (released May 20, 2016)
+
+There are no significant changes between 2.3.0 and 2.3b2.
+
+## Other notable fixes and improvements
+
+- `abbr` now allows non-letter keys (#2996).
+- Define a few extra colours on first start (#2987).
+- Multiple documentation updates.
+- Added completions for rmmod (#3007).
+- Improved completions for git (#2998).
+
+## Known issues
+
+- Interactive commands started from fish configuration files or from the `-c` option may, under certain circumstances, be started with incorrect terminal modes and fail to behave as expected. A fix is planned but requires further testing (#2619).
+
+---
+
 # fish 2.3b2 (released May 5, 2016)
 
 ## Significant changes
@@ -12,6 +30,8 @@
 - Avoid confusing the terminal line driver with non-printing characters in `fish_title` (#2453).
 - Improved completions for busctl, git (#2585, #2879, #2984), and netctl.
 
+---
+
 # fish 2.3b1 (released April 19, 2016)
 
 ## Significant Changes
@@ -67,6 +87,8 @@
 - PWD shortening in the prompt can now be configured via the `fish_prompt_pwd_dir_length` variable, set to the length per path component (#2473)
 - fish no longer requires `/etc/fish/config.fish` to correctly start, and now ships a skeleton file that only contains some documentation (#2799)
 
+---
+
 # fish 2.2.0 (released July 12, 2015)
 
 ### Significant changes ###
diff --git a/osx/Info.plist b/osx/Info.plist
index 3a2742dd..dbbcc639 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.999</string>
+	<string>2.3.500</string>
 	<key>CFBundleVersion</key>
 	<string>0.1</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/osx/config.h b/osx/config.h
index 23e376a8..2b037f5e 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -219,7 +219,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.3b2-git"
+#define PACKAGE_STRING "fish 2.3.0-git"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fish"
@@ -228,7 +228,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.3b2-git"
+#define PACKAGE_VERSION "2.3.0-git"
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4
@@ -245,17 +245,49 @@
 /* Perform string translations with gettext */
 /* #undef USE_GETTEXT */
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
 /* The size of wchar_t in bits. */
 #define WCHAR_T_BITS 32
 
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
 /* Macro to enable additional prototypes under BSD */
 /* #undef _NETBSD_SOURCE */
 
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
 /* Macro to enable additional prototypes under BSD */
 /* #undef __BSD_VISIBLE */
 
 /* Macro to enable additional prototypes under Solaris */
-/* #undef __EXTENSIONS__ */
+#define __EXTENSIONS__ 1
 
 #if __GNUC__ >= 3
 #ifndef __warn_unused