Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 15:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Integration_2.5.0'

Browse source
This commit is contained in:
David Adam 2017-02-03 21:14:40 +08:00
commit 49e98cde4c
4 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -1,4 +1,12 @@
# fish 2.5b1 (released ???) # fish 2.5.0 (released February 3, 2017)
There are no major changes between 2.5b1 and 2.5.0. If you are upgrading from version 2.4.0 or before, please also review the release notes for 2.5b1 (included below).
## Notable fixes and improvements
- The Home, End, Insert, Delete, Page Up and Page Down keys work in Vi-style key bindings (#3731).
# fish 2.5b1 (released January 14, 2017)
## Platform Changes ## Platform Changes

2
osx/Info.plist
View file

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

14
osx/config.h
View file

@ -5,7 +5,7 @@
#define HAVE_BACKTRACE_SYMBOLS 1 #define HAVE_BACKTRACE_SYMBOLS 1
/* Define to 1 if you have the `clock_gettime' function. */ /* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1 /* #undef HAVE_CLOCK_GETTIME */
/* Define to 1 if you have the <curses.h> header file. */ /* Define to 1 if you have the <curses.h> header file. */
#define HAVE_CURSES_H 1 #define HAVE_CURSES_H 1
@ -60,7 +60,7 @@
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mkostemp' function. */ /* Define to 1 if you have the `mkostemp' function. */
#define HAVE_MKOSTEMP 1 /* #undef HAVE_MKOSTEMP */
/* Define to 1 if you have the <ncurses/curses.h> header file. */ /* Define to 1 if you have the <ncurses/curses.h> header file. */
/* #undef HAVE_NCURSES_CURSES_H */ /* #undef HAVE_NCURSES_CURSES_H */
@ -157,6 +157,12 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define to 1 if you have the `wcscasecmp' function. */
#define HAVE_WCSCASECMP 1
/* Define to 1 if you have the `wcsdup' function. */
#define HAVE_WCSDUP 1
/* Define to 1 if you have the `wcslcpy' function. */ /* Define to 1 if you have the `wcslcpy' function. */
#define HAVE_WCSLCPY 1 #define HAVE_WCSLCPY 1
@ -191,7 +197,7 @@
#define PACKAGE_NAME "fish" #define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "fish 2.4.0-git" #define PACKAGE_STRING "fish 2.5.0-git"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish" #define PACKAGE_TARNAME "fish"
@ -200,7 +206,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "2.4.0-git" #define PACKAGE_VERSION "2.5.0-git"
/* The size of `wchar_t', as computed by sizeof. */ /* The size of `wchar_t', as computed by sizeof. */
#define SIZEOF_WCHAR_T 4 #define SIZEOF_WCHAR_T 4

8
share/functions/__fish_config_interactive.fish
View file

@ -235,14 +235,6 @@ function __fish_config_interactive -d "Initializations that should be performed
and return and return
printf \e\]7\;file://\%s\%s\a (hostname) (echo -n $PWD | __fish_urlencode) printf \e\]7\;file://\%s\%s\a (hostname) (echo -n $PWD | __fish_urlencode)
end end
if test "$TERM_PROGRAM" = "Apple_Terminal"
# Suppress duplicative title display on Terminal.app
if not functions -q fish_title
echo -n \e\]0\;\a # clear existing title
function fish_title -d 'no-op terminal title'
end
end
end
__update_cwd_osc # Run once because we might have already inherited a PWD from an old tab __update_cwd_osc # Run once because we might have already inherited a PWD from an old tab
end end