Attachment #183558 for bug #220068

View | Details | Raw Unified | Return to bug 220068
Collapse All | Expand All

Lines 2-8 Link Here

(-)shells/fish/Makefile (-2 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fish	4	PORTNAME= fish
5	PORTVERSION= 2.5.0	5	PORTVERSION= 2.6.0
6	CATEGORIES= shells	6	CATEGORIES= shells
7	MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/	7	MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/
8		8
Lines 11-18 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
		14	LIB_DEPENDS+= libpcre2-32.so:devel/pcre2
		15
14	USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \	16	USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \
15	localbase compiler:c++11-lang	17	localbase compiler:c++11-lang shebangfix
		18	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
16		19
17	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
18		21

Lines 1-3 Link Here

(-)shells/fish/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486791004	1	TIMESTAMP = 1497402776
2	SHA256 (fish-2.5.0.tar.gz) = f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5	2	SHA256 (fish-2.6.0.tar.gz) = 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
3	SIZE (fish-2.5.0.tar.gz) = 3496831	3	SIZE (fish-2.6.0.tar.gz) = 3575346




--- share/completions/python.fish.orig	2017-02-11 04:56:23 UTC
+++ share/completions/python.fish
@@ -16,15 +16,3 @@ complete -c python -s W -x --description
 complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
 complete -c python -a "(__fish_complete_suffix .py)"
 complete -c python -a '-' -d 'Read program from stdin'
-
-switch (python -V 2>&1 | string replace -r '^.*\s([23])..*' '$1')[1]
-    case 2
-        complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
-        complete -c python -s t --description "Warn on mixed tabs and spaces"
-        complete -c python -s Q -x -a "old new warn warnall" --description "Division control"
-    case 3
-        complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup'
-        complete -c python -s X -x -d 'Set implementation-specific option'
-        complete -c python -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
-        complete -c python -o bb -d 'Issue errors'
-end

Lines 1-11 Link Here

(-)shells/fish/files/patch-share_functions_____fish__print__filesystems.fish (-11 lines)
1	--- share/functions/__fish_print_filesystems.fish.orig 2017-02-03 01:46:58 UTC
2	+++ share/functions/__fish_print_filesystems.fish
3	@@ -4,6 +4,6 @@ function __fish_print_filesystems -d "Pr
4	set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs
5	set fs $fs reiserfs romfs smbfs sysv tmpfs udf ufs umsdos vfat xenix xfs xiafs
6	# Mount has helper binaries to mount filesystems
7	- # These are called mount.* and are placed somewhere in $PATH
8	- printf "%s\n" $fs (string replace -ra "./mount." "" -- $PATH/mount.)
9	+ # These are called mount_* and are placed somewhere in $PATH
10	+ printf "%s\n" $fs (string replace -ra "./mount_" "" -- $PATH/mount_)
11	end

Line 0 Link Here

(-)shells/fish/files/patch-src_common.cpp (+11 lines)
	1	--- src/common.cpp.orig 2017-06-16 23:56:48 UTC
	2	+++ src/common.cpp
	3	@@ -1986,7 +1986,7 @@ void redirect_tty_output() {
	4	}
	5
	6	/// Display a failed assertion message, dump a stack trace if possible, then die.
	7	-[[noreturn]] void __assert(const char msg, const char file, size_t line, int error) {
	8	+[[noreturn]] void __fish_assert(const char msg, const char file, size_t line, int error) {
	9	if (error) {
	10	debug(0, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
	11	strerror(error));




--- src/common.h.orig	2017-06-16 23:55:11 UTC
+++ src/common.h
@@ -213,23 +213,21 @@ extern bool has_working_tty_timestamps;
 /// stdio functions and should be writing the message to stderr rather than stdout. Second, if
 /// possible it is useful to provide additional context such as a stack backtrace.
 #undef assert
-#undef __assert
-//#define assert(e)  do {(void)((e) ? ((void)0) : __assert(#e, __FILE__, __LINE__)); } while(false)
-#define assert(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, 0)
-#define assert_with_errno(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, errno)
-#define DIE(msg) __assert(msg, __FILE__, __LINE__, 0)
-#define DIE_WITH_ERRNO(msg) __assert(msg, __FILE__, __LINE__, errno)
+#define assert(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, 0)
+#define assert_with_errno(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, errno)
+#define DIE(msg) __fish_assert(msg, __FILE__, __LINE__, 0)
+#define DIE_WITH_ERRNO(msg) __fish_assert(msg, __FILE__, __LINE__, errno)
 /// This macro is meant to be used with functions that return zero on success otherwise return an
 /// errno value. Most notably the pthread family of functions which we never expect to fail.
 #define DIE_ON_FAILURE(e)                             \
     do {                                              \
         int status = e;                               \
         if (status != 0) {                            \
-            __assert(#e, __FILE__, __LINE__, status); \
+            __fish_assert(#e, __FILE__, __LINE__, status); \
         }                                             \
     } while (0)
 
-[[noreturn]] void __assert(const char *msg, const char *file, size_t line, int error);
+[[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error);
 
 /// Check if signals are blocked. If so, print an error message and return from the function
 /// performing this check.




%%DATADIR%%/completions/alsactl.fish
%%DATADIR%%/completions/alsamixer.fish
%%DATADIR%%/completions/amixer.fish
%%DATADIR%%/completions/anamnesis.fish
%%DATADIR%%/completions/and.fish
%%DATADIR%%/completions/animate.fish
%%DATADIR%%/completions/ant.fish

%%DATADIR%%/completions/builtin.fish
%%DATADIR%%/completions/bundle.fish
%%DATADIR%%/completions/bunzip2.fish
%%DATADIR%%/completions/burp.fish
%%DATADIR%%/completions/busctl.fish
%%DATADIR%%/completions/bzcat.fish
%%DATADIR%%/completions/bzip2.fish

%%DATADIR%%/completions/bzr.fish
%%DATADIR%%/completions/cabal-dev.fish
%%DATADIR%%/completions/cabal.fish
%%DATADIR%%/completions/caddy.fish
%%DATADIR%%/completions/caffeinate.fish
%%DATADIR%%/completions/cancel.fish
%%DATADIR%%/completions/canto.fish
%%DATADIR%%/completions/cargo.fish
%%DATADIR%%/completions/castnow.fish
%%DATADIR%%/completions/cat.fish
%%DATADIR%%/completions/cd.fish
%%DATADIR%%/completions/cdrecord.fish

%%DATADIR%%/completions/chmod.fish
%%DATADIR%%/completions/chown.fish
%%DATADIR%%/completions/chsh.fish
%%DATADIR%%/completions/climate.fish
%%DATADIR%%/completions/colordiff.fish
%%DATADIR%%/completions/colorsvn.fish
%%DATADIR%%/completions/combine.fish

%%DATADIR%%/completions/darcs.fish
%%DATADIR%%/completions/date.fish
%%DATADIR%%/completions/dconf.fish
%%DATADIR%%/completions/dcop.fish
%%DATADIR%%/completions/dd.fish
%%DATADIR%%/completions/defaults.fish
%%DATADIR%%/completions/df.fish

%%DATADIR%%/completions/diskutil.fish
%%DATADIR%%/completions/display.fish
%%DATADIR%%/completions/djview.fish
%%DATADIR%%/completions/djview3.fish
%%DATADIR%%/completions/djview4.fish
%%DATADIR%%/completions/dlocate.fish
%%DATADIR%%/completions/dmesg.fish

%%DATADIR%%/completions/dvipdf.fish
%%DATADIR%%/completions/dvipdfm.fish
%%DATADIR%%/completions/echo.fish
%%DATADIR%%/completions/effectv.fish
%%DATADIR%%/completions/egrep.fish
%%DATADIR%%/completions/eix-sync.fish
%%DATADIR%%/completions/eix.fish

%%DATADIR%%/completions/exec.fish
%%DATADIR%%/completions/exit.fish
%%DATADIR%%/completions/expand.fish
%%DATADIR%%/completions/fcrontab.fish
%%DATADIR%%/completions/feh.fish
%%DATADIR%%/completions/fg.fish
%%DATADIR%%/completions/fgrep.fish

%%DATADIR%%/completions/fish.fish
%%DATADIR%%/completions/fish_indent.fish
%%DATADIR%%/completions/flac.fish
%%DATADIR%%/completions/flatpak.fish
%%DATADIR%%/completions/fluxbox-remote.fish
%%DATADIR%%/completions/fossil.fish
%%DATADIR%%/completions/ftp.fish

%%DATADIR%%/completions/gpg.fish
%%DATADIR%%/completions/gphoto2.fish
%%DATADIR%%/completions/gprof.fish
%%DATADIR%%/completions/gradle.fish
%%DATADIR%%/completions/grep.fish
%%DATADIR%%/completions/groupadd.fish
%%DATADIR%%/completions/grunt.fish
%%DATADIR%%/completions/gsettings.fish
%%DATADIR%%/completions/gunzip.fish
%%DATADIR%%/completions/gv.fish
%%DATADIR%%/completions/gvim.fish

%%DATADIR%%/completions/gvimdiff.fish
%%DATADIR%%/completions/gzip.fish
%%DATADIR%%/completions/head.fish
%%DATADIR%%/completions/helm.fish
%%DATADIR%%/completions/help.fish
%%DATADIR%%/completions/heroku.fish
%%DATADIR%%/completions/hg.fish

%%DATADIR%%/completions/highlight.fish
%%DATADIR%%/completions/history.fish
%%DATADIR%%/completions/htop.fish
%%DATADIR%%/completions/i3-msg.fish
%%DATADIR%%/completions/iconv.fish
%%DATADIR%%/completions/id.fish
%%DATADIR%%/completions/identify.fish

%%DATADIR%%/completions/import.fish
%%DATADIR%%/completions/invoke-rc.d.fish
%%DATADIR%%/completions/ip.fish
%%DATADIR%%/completions/ipset.fish
%%DATADIR%%/completions/iptables.fish
%%DATADIR%%/completions/jobs.fish
%%DATADIR%%/completions/journalctl.fish
%%DATADIR%%/completions/jq.fish
%%DATADIR%%/completions/kcmshell5.fish
%%DATADIR%%/completions/kill.fish
%%DATADIR%%/completions/killall.fish

%%DATADIR%%/completions/launchctl.fish
%%DATADIR%%/completions/lein.fish
%%DATADIR%%/completions/less.fish
%%DATADIR%%/completions/light.fish
%%DATADIR%%/completions/ll.fish
%%DATADIR%%/completions/ln.fish
%%DATADIR%%/completions/localectl.fish

%%DATADIR%%/completions/lxpanel.fish
%%DATADIR%%/completions/m4.fish
%%DATADIR%%/completions/machinectl.fish
%%DATADIR%%/completions/magento.fish
%%DATADIR%%/completions/make.fish
%%DATADIR%%/completions/makedepend.fish
%%DATADIR%%/completions/makepkg.fish

%%DATADIR%%/completions/mdimport.fish
%%DATADIR%%/completions/mdls.fish
%%DATADIR%%/completions/mdutil.fish
%%DATADIR%%/completions/minikube.fish
%%DATADIR%%/completions/mix.fish
%%DATADIR%%/completions/mkdir.fish
%%DATADIR%%/completions/mkdosfs.fish
%%DATADIR%%/completions/mkfs.fat.fish
%%DATADIR%%/completions/mkfs.vfat.fish
%%DATADIR%%/completions/mkinitcpio.fish
%%DATADIR%%/completions/mktemp.fish
%%DATADIR%%/completions/mkvextract.fish
%%DATADIR%%/completions/mocha.fish
%%DATADIR%%/completions/mocp.fish
%%DATADIR%%/completions/modinfo.fish
%%DATADIR%%/completions/modprobe.fish

%%DATADIR%%/completions/psql.fish
%%DATADIR%%/completions/psub.fish
%%DATADIR%%/completions/pushd.fish
%%DATADIR%%/completions/pv.fish
%%DATADIR%%/completions/pydf.fish
%%DATADIR%%/completions/pygmentize.fish
%%DATADIR%%/completions/python.fish

%%DATADIR%%/completions/set.fish
%%DATADIR%%/completions/set_color.fish
%%DATADIR%%/completions/setfacl.fish
%%DATADIR%%/completions/setsid.fish
%%DATADIR%%/completions/setxkbmap.fish
%%DATADIR%%/completions/sha1sum.fish
%%DATADIR%%/completions/sha224sum.fish

%%DATADIR%%/completions/tee.fish
%%DATADIR%%/completions/telnet.fish
%%DATADIR%%/completions/termite.fish
%%DATADIR%%/completions/terraform.fish
%%DATADIR%%/completions/test.fish
%%DATADIR%%/completions/tex.fish
%%DATADIR%%/completions/time.fish

%%DATADIR%%/completions/update-eix-remote.fish
%%DATADIR%%/completions/update-eix.fish
%%DATADIR%%/completions/useradd.fish
%%DATADIR%%/completions/usermod.fish
%%DATADIR%%/completions/vagrant.fish
%%DATADIR%%/completions/valgrind.fish
%%DATADIR%%/completions/vared.fish

%%DATADIR%%/completions/xdvi.fish
%%DATADIR%%/completions/xelatex.fish
%%DATADIR%%/completions/xgettext.fish
%%DATADIR%%/completions/xinput.fish
%%DATADIR%%/completions/xmms.fish
%%DATADIR%%/completions/xpdf.fish
%%DATADIR%%/completions/xprop.fish

%%DATADIR%%/completions/xterm.fish
%%DATADIR%%/completions/xz.fish
%%DATADIR%%/completions/yaourt.fish
%%DATADIR%%/completions/yarn.fish
%%DATADIR%%/completions/yast2.fish
%%DATADIR%%/completions/yum.fish
%%DATADIR%%/completions/zcat.fish

%%DATADIR%%/functions/__fish_bind_test1.fish
%%DATADIR%%/functions/__fish_bind_test2.fish
%%DATADIR%%/functions/__fish_cancel_commandline.fish
%%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
%%DATADIR%%/functions/__fish_commandline_test.fish
%%DATADIR%%/functions/__fish_complete_abook_formats.fish
%%DATADIR%%/functions/__fish_complete_ant_targets.fish

%%DATADIR%%/functions/__fish_complete_lpr_option.fish
%%DATADIR%%/functions/__fish_complete_lsusb.fish
%%DATADIR%%/functions/__fish_complete_man.fish
%%DATADIR%%/functions/__fish_complete_mount_opts.fish
%%DATADIR%%/functions/__fish_complete_path.fish
%%DATADIR%%/functions/__fish_complete_pgrep.fish
%%DATADIR%%/functions/__fish_complete_pids.fish

%%DATADIR%%/functions/__fish_gnu_complete.fish
%%DATADIR%%/functions/__fish_hg_prompt.fish
%%DATADIR%%/functions/__fish_is_first_token.fish
%%DATADIR%%/functions/__fish_is_git_repository.fish
%%DATADIR%%/functions/__fish_is_token_n.fish
%%DATADIR%%/functions/__fish_list_current_token.fish
%%DATADIR%%/functions/__fish_make_completion_signals.fish

%%DATADIR%%/functions/fish_hybrid_key_bindings.fish
%%DATADIR%%/functions/fish_indent.fish
%%DATADIR%%/functions/fish_key_reader.fish
%%DATADIR%%/functions/fish_md5.fish
%%DATADIR%%/functions/fish_mode_prompt.fish
%%DATADIR%%/functions/fish_prompt.fish
%%DATADIR%%/functions/fish_update_completions.fish

%%DATADIR%%/man/man1/count.1.gz
%%DATADIR%%/man/man1/dirh.1.gz
%%DATADIR%%/man/man1/dirs.1.gz
%%DATADIR%%/man/man1/disown.1.gz
%%DATADIR%%/man/man1/echo.1.gz
%%DATADIR%%/man/man1/else.1.gz
%%DATADIR%%/man/man1/emit.1.gz

%%DATADIR%%/tools/web_config/favicon.png
%%DATADIR%%/tools/web_config/fishconfig.css
%%DATADIR%%/tools/web_config/index.html
%%DATADIR%%/tools/web_config/js/angular-sanitize.js
%%DATADIR%%/tools/web_config/js/angular.js
%%DATADIR%%/tools/web_config/js/app.js
%%DATADIR%%/tools/web_config/js/colorutils.js

%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
%%NLS%%share/locale/nb/LC_MESSAGES/fish.mo
%%NLS%%share/locale/nn/LC_MESSAGES/fish.mo
%%NLS%%share/locale/pl/LC_MESSAGES/fish.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo

Return to bug 220068

Lines 1-18 Link Here

(-)shells/fish/files/patch-share_completions_python.fish (-18 lines)
1	--- share/completions/python.fish.orig 2017-02-11 04:56:23 UTC
2	+++ share/completions/python.fish
3	@@ -16,15 +16,3 @@ complete -c python -s W -x --description
4	complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
5	complete -c python -a "(__fish_complete_suffix .py)"
6	complete -c python -a '-' -d 'Read program from stdin'
7	-
8	-switch (python -V 2>&1 \| string replace -r '^.\s([23])..' '$1')[1]
9	- case 2
10	- complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
11	- complete -c python -s t --description "Warn on mixed tabs and spaces"
12	- complete -c python -s Q -x -a "old new warn warnall" --description "Division control"
13	- case 3
14	- complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup'
15	- complete -c python -s X -x -d 'Set implementation-specific option'
16	- complete -c python -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
17	- complete -c python -o bb -d 'Issue errors'
18	-end

Line 0 Link Here

(-)shells/fish/files/patch-src_common.h (+32 lines)
	1	--- src/common.h.orig 2017-06-16 23:55:11 UTC
	2	+++ src/common.h
	3	@@ -213,23 +213,21 @@ extern bool has_working_tty_timestamps;
	4	/// stdio functions and should be writing the message to stderr rather than stdout. Second, if
	5	/// possible it is useful to provide additional context such as a stack backtrace.
	6	#undef assert
	7	-#undef __assert
	8	-//#define assert(e) do {(void)((e) ? ((void)0) : __assert(#e, __FILE__, __LINE__)); } while(false)
	9	-#define assert(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, 0)
	10	-#define assert_with_errno(e) (e) ? ((void)0) : __assert(#e, __FILE__, __LINE__, errno)
	11	-#define DIE(msg) __assert(msg, __FILE__, __LINE__, 0)
	12	-#define DIE_WITH_ERRNO(msg) __assert(msg, __FILE__, __LINE__, errno)
	13	+#define assert(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, 0)
	14	+#define assert_with_errno(e) (e) ? ((void)0) : __fish_assert(#e, __FILE__, __LINE__, errno)
	15	+#define DIE(msg) __fish_assert(msg, __FILE__, __LINE__, 0)
	16	+#define DIE_WITH_ERRNO(msg) __fish_assert(msg, __FILE__, __LINE__, errno)
	17	/// This macro is meant to be used with functions that return zero on success otherwise return an
	18	/// errno value. Most notably the pthread family of functions which we never expect to fail.
	19	#define DIE_ON_FAILURE(e) \
	20	do { \
	21	int status = e; \
	22	if (status != 0) { \
	23	- __assert(#e, __FILE__, __LINE__, status); \
	24	+ __fish_assert(#e, __FILE__, __LINE__, status); \
	25	} \
	26	} while (0)
	27
	28	-[[noreturn]] void __assert(const char msg, const char file, size_t line, int error);
	29	+[[noreturn]] void __fish_assert(const char msg, const char file, size_t line, int error);
	30
	31	/// Check if signals are blocked. If so, print an error message and return from the function
	32	/// performing this check.

Lines 69-75 Link Here

(-)shells/fish/pkg-plist (-7 / +31 lines)
69	%%DATADIR%%/completions/alsactl.fish	69	%%DATADIR%%/completions/alsactl.fish
70	%%DATADIR%%/completions/alsamixer.fish	70	%%DATADIR%%/completions/alsamixer.fish
71	%%DATADIR%%/completions/amixer.fish	71	%%DATADIR%%/completions/amixer.fish
72	%%DATADIR%%/completions/anamnesis.fish
73	%%DATADIR%%/completions/and.fish	72	%%DATADIR%%/completions/and.fish
74	%%DATADIR%%/completions/animate.fish	73	%%DATADIR%%/completions/animate.fish
75	%%DATADIR%%/completions/ant.fish	74	%%DATADIR%%/completions/ant.fish
Lines 128-134 Link Here
128	%%DATADIR%%/completions/builtin.fish	127	%%DATADIR%%/completions/builtin.fish
129	%%DATADIR%%/completions/bundle.fish	128	%%DATADIR%%/completions/bundle.fish
130	%%DATADIR%%/completions/bunzip2.fish	129	%%DATADIR%%/completions/bunzip2.fish
131	%%DATADIR%%/completions/burp.fish
132	%%DATADIR%%/completions/busctl.fish	130	%%DATADIR%%/completions/busctl.fish
133	%%DATADIR%%/completions/bzcat.fish	131	%%DATADIR%%/completions/bzcat.fish
134	%%DATADIR%%/completions/bzip2.fish	132	%%DATADIR%%/completions/bzip2.fish
Lines 136-145 Link Here
136	%%DATADIR%%/completions/bzr.fish	134	%%DATADIR%%/completions/bzr.fish
137	%%DATADIR%%/completions/cabal-dev.fish	135	%%DATADIR%%/completions/cabal-dev.fish
138	%%DATADIR%%/completions/cabal.fish	136	%%DATADIR%%/completions/cabal.fish
		137	%%DATADIR%%/completions/caddy.fish
139	%%DATADIR%%/completions/caffeinate.fish	138	%%DATADIR%%/completions/caffeinate.fish
140	%%DATADIR%%/completions/cancel.fish	139	%%DATADIR%%/completions/cancel.fish
141	%%DATADIR%%/completions/canto.fish	140	%%DATADIR%%/completions/canto.fish
142	%%DATADIR%%/completions/cargo.fish	141	%%DATADIR%%/completions/cargo.fish
		142	%%DATADIR%%/completions/castnow.fish
143	%%DATADIR%%/completions/cat.fish	143	%%DATADIR%%/completions/cat.fish
144	%%DATADIR%%/completions/cd.fish	144	%%DATADIR%%/completions/cd.fish
145	%%DATADIR%%/completions/cdrecord.fish	145	%%DATADIR%%/completions/cdrecord.fish
Lines 147-152 Link Here
147	%%DATADIR%%/completions/chmod.fish	147	%%DATADIR%%/completions/chmod.fish
148	%%DATADIR%%/completions/chown.fish	148	%%DATADIR%%/completions/chown.fish
149	%%DATADIR%%/completions/chsh.fish	149	%%DATADIR%%/completions/chsh.fish
		150	%%DATADIR%%/completions/climate.fish
150	%%DATADIR%%/completions/colordiff.fish	151	%%DATADIR%%/completions/colordiff.fish
151	%%DATADIR%%/completions/colorsvn.fish	152	%%DATADIR%%/completions/colorsvn.fish
152	%%DATADIR%%/completions/combine.fish	153	%%DATADIR%%/completions/combine.fish
Lines 176-182 Link Here
176	%%DATADIR%%/completions/darcs.fish	177	%%DATADIR%%/completions/darcs.fish
177	%%DATADIR%%/completions/date.fish	178	%%DATADIR%%/completions/date.fish
178	%%DATADIR%%/completions/dconf.fish	179	%%DATADIR%%/completions/dconf.fish
179	%%DATADIR%%/completions/dcop.fish
180	%%DATADIR%%/completions/dd.fish	180	%%DATADIR%%/completions/dd.fish
181	%%DATADIR%%/completions/defaults.fish	181	%%DATADIR%%/completions/defaults.fish
182	%%DATADIR%%/completions/df.fish	182	%%DATADIR%%/completions/df.fish
Lines 185-191 Link Here
185	%%DATADIR%%/completions/diskutil.fish	185	%%DATADIR%%/completions/diskutil.fish
186	%%DATADIR%%/completions/display.fish	186	%%DATADIR%%/completions/display.fish
187	%%DATADIR%%/completions/djview.fish	187	%%DATADIR%%/completions/djview.fish
188	%%DATADIR%%/completions/djview3.fish
189	%%DATADIR%%/completions/djview4.fish	188	%%DATADIR%%/completions/djview4.fish
190	%%DATADIR%%/completions/dlocate.fish	189	%%DATADIR%%/completions/dlocate.fish
191	%%DATADIR%%/completions/dmesg.fish	190	%%DATADIR%%/completions/dmesg.fish
Lines 198-204 Link Here
198	%%DATADIR%%/completions/dvipdf.fish	197	%%DATADIR%%/completions/dvipdf.fish
199	%%DATADIR%%/completions/dvipdfm.fish	198	%%DATADIR%%/completions/dvipdfm.fish
200	%%DATADIR%%/completions/echo.fish	199	%%DATADIR%%/completions/echo.fish
201	%%DATADIR%%/completions/effectv.fish
202	%%DATADIR%%/completions/egrep.fish	200	%%DATADIR%%/completions/egrep.fish
203	%%DATADIR%%/completions/eix-sync.fish	201	%%DATADIR%%/completions/eix-sync.fish
204	%%DATADIR%%/completions/eix.fish	202	%%DATADIR%%/completions/eix.fish
Lines 217-223 Link Here
217	%%DATADIR%%/completions/exec.fish	215	%%DATADIR%%/completions/exec.fish
218	%%DATADIR%%/completions/exit.fish	216	%%DATADIR%%/completions/exit.fish
219	%%DATADIR%%/completions/expand.fish	217	%%DATADIR%%/completions/expand.fish
220	%%DATADIR%%/completions/fcrontab.fish
221	%%DATADIR%%/completions/feh.fish	218	%%DATADIR%%/completions/feh.fish
222	%%DATADIR%%/completions/fg.fish	219	%%DATADIR%%/completions/fg.fish
223	%%DATADIR%%/completions/fgrep.fish	220	%%DATADIR%%/completions/fgrep.fish
Lines 227-232 Link Here
227	%%DATADIR%%/completions/fish.fish	224	%%DATADIR%%/completions/fish.fish
228	%%DATADIR%%/completions/fish_indent.fish	225	%%DATADIR%%/completions/fish_indent.fish
229	%%DATADIR%%/completions/flac.fish	226	%%DATADIR%%/completions/flac.fish
		227	%%DATADIR%%/completions/flatpak.fish
230	%%DATADIR%%/completions/fluxbox-remote.fish	228	%%DATADIR%%/completions/fluxbox-remote.fish
231	%%DATADIR%%/completions/fossil.fish	229	%%DATADIR%%/completions/fossil.fish
232	%%DATADIR%%/completions/ftp.fish	230	%%DATADIR%%/completions/ftp.fish
Lines 250-258 Link Here
250	%%DATADIR%%/completions/gpg.fish	248	%%DATADIR%%/completions/gpg.fish
251	%%DATADIR%%/completions/gphoto2.fish	249	%%DATADIR%%/completions/gphoto2.fish
252	%%DATADIR%%/completions/gprof.fish	250	%%DATADIR%%/completions/gprof.fish
		251	%%DATADIR%%/completions/gradle.fish
253	%%DATADIR%%/completions/grep.fish	252	%%DATADIR%%/completions/grep.fish
254	%%DATADIR%%/completions/groupadd.fish	253	%%DATADIR%%/completions/groupadd.fish
255	%%DATADIR%%/completions/grunt.fish	254	%%DATADIR%%/completions/grunt.fish
		255	%%DATADIR%%/completions/gsettings.fish
256	%%DATADIR%%/completions/gunzip.fish	256	%%DATADIR%%/completions/gunzip.fish
257	%%DATADIR%%/completions/gv.fish	257	%%DATADIR%%/completions/gv.fish
258	%%DATADIR%%/completions/gvim.fish	258	%%DATADIR%%/completions/gvim.fish
Lines 259-264 Link Here
259	%%DATADIR%%/completions/gvimdiff.fish	259	%%DATADIR%%/completions/gvimdiff.fish
260	%%DATADIR%%/completions/gzip.fish	260	%%DATADIR%%/completions/gzip.fish
261	%%DATADIR%%/completions/head.fish	261	%%DATADIR%%/completions/head.fish
		262	%%DATADIR%%/completions/helm.fish
262	%%DATADIR%%/completions/help.fish	263	%%DATADIR%%/completions/help.fish
263	%%DATADIR%%/completions/heroku.fish	264	%%DATADIR%%/completions/heroku.fish
264	%%DATADIR%%/completions/hg.fish	265	%%DATADIR%%/completions/hg.fish
Lines 265-270 Link Here
265	%%DATADIR%%/completions/highlight.fish	266	%%DATADIR%%/completions/highlight.fish
266	%%DATADIR%%/completions/history.fish	267	%%DATADIR%%/completions/history.fish
267	%%DATADIR%%/completions/htop.fish	268	%%DATADIR%%/completions/htop.fish
		269	%%DATADIR%%/completions/i3-msg.fish
268	%%DATADIR%%/completions/iconv.fish	270	%%DATADIR%%/completions/iconv.fish
269	%%DATADIR%%/completions/id.fish	271	%%DATADIR%%/completions/id.fish
270	%%DATADIR%%/completions/identify.fish	272	%%DATADIR%%/completions/identify.fish
Lines 276-284 Link Here
276	%%DATADIR%%/completions/import.fish	278	%%DATADIR%%/completions/import.fish
277	%%DATADIR%%/completions/invoke-rc.d.fish	279	%%DATADIR%%/completions/invoke-rc.d.fish
278	%%DATADIR%%/completions/ip.fish	280	%%DATADIR%%/completions/ip.fish
		281	%%DATADIR%%/completions/ipset.fish
279	%%DATADIR%%/completions/iptables.fish	282	%%DATADIR%%/completions/iptables.fish
280	%%DATADIR%%/completions/jobs.fish	283	%%DATADIR%%/completions/jobs.fish
281	%%DATADIR%%/completions/journalctl.fish	284	%%DATADIR%%/completions/journalctl.fish
		285	%%DATADIR%%/completions/jq.fish
282	%%DATADIR%%/completions/kcmshell5.fish	286	%%DATADIR%%/completions/kcmshell5.fish
283	%%DATADIR%%/completions/kill.fish	287	%%DATADIR%%/completions/kill.fish
284	%%DATADIR%%/completions/killall.fish	288	%%DATADIR%%/completions/killall.fish
Lines 289-294 Link Here
289	%%DATADIR%%/completions/launchctl.fish	293	%%DATADIR%%/completions/launchctl.fish
290	%%DATADIR%%/completions/lein.fish	294	%%DATADIR%%/completions/lein.fish
291	%%DATADIR%%/completions/less.fish	295	%%DATADIR%%/completions/less.fish
		296	%%DATADIR%%/completions/light.fish
292	%%DATADIR%%/completions/ll.fish	297	%%DATADIR%%/completions/ll.fish
293	%%DATADIR%%/completions/ln.fish	298	%%DATADIR%%/completions/ln.fish
294	%%DATADIR%%/completions/localectl.fish	299	%%DATADIR%%/completions/localectl.fish
Lines 316-321 Link Here
316	%%DATADIR%%/completions/lxpanel.fish	321	%%DATADIR%%/completions/lxpanel.fish
317	%%DATADIR%%/completions/m4.fish	322	%%DATADIR%%/completions/m4.fish
318	%%DATADIR%%/completions/machinectl.fish	323	%%DATADIR%%/completions/machinectl.fish
		324	%%DATADIR%%/completions/magento.fish
319	%%DATADIR%%/completions/make.fish	325	%%DATADIR%%/completions/make.fish
320	%%DATADIR%%/completions/makedepend.fish	326	%%DATADIR%%/completions/makedepend.fish
321	%%DATADIR%%/completions/makepkg.fish	327	%%DATADIR%%/completions/makepkg.fish
Lines 328-339 Link Here
328	%%DATADIR%%/completions/mdimport.fish	334	%%DATADIR%%/completions/mdimport.fish
329	%%DATADIR%%/completions/mdls.fish	335	%%DATADIR%%/completions/mdls.fish
330	%%DATADIR%%/completions/mdutil.fish	336	%%DATADIR%%/completions/mdutil.fish
331	%%DATADIR%%/completions/meat.fish	337	%%DATADIR%%/completions/minikube.fish
332	%%DATADIR%%/completions/mix.fish	338	%%DATADIR%%/completions/mix.fish
333	%%DATADIR%%/completions/mkdir.fish	339	%%DATADIR%%/completions/mkdir.fish
		340	%%DATADIR%%/completions/mkdosfs.fish
		341	%%DATADIR%%/completions/mkfs.fat.fish
		342	%%DATADIR%%/completions/mkfs.vfat.fish
334	%%DATADIR%%/completions/mkinitcpio.fish	343	%%DATADIR%%/completions/mkinitcpio.fish
335	%%DATADIR%%/completions/mktemp.fish	344	%%DATADIR%%/completions/mktemp.fish
336	%%DATADIR%%/completions/mkvextract.fish	345	%%DATADIR%%/completions/mkvextract.fish
		346	%%DATADIR%%/completions/mocha.fish
337	%%DATADIR%%/completions/mocp.fish	347	%%DATADIR%%/completions/mocp.fish
338	%%DATADIR%%/completions/modinfo.fish	348	%%DATADIR%%/completions/modinfo.fish
339	%%DATADIR%%/completions/modprobe.fish	349	%%DATADIR%%/completions/modprobe.fish
Lines 415-420 Link Here
415	%%DATADIR%%/completions/psql.fish	425	%%DATADIR%%/completions/psql.fish
416	%%DATADIR%%/completions/psub.fish	426	%%DATADIR%%/completions/psub.fish
417	%%DATADIR%%/completions/pushd.fish	427	%%DATADIR%%/completions/pushd.fish
		428	%%DATADIR%%/completions/pv.fish
418	%%DATADIR%%/completions/pydf.fish	429	%%DATADIR%%/completions/pydf.fish
419	%%DATADIR%%/completions/pygmentize.fish	430	%%DATADIR%%/completions/pygmentize.fish
420	%%DATADIR%%/completions/python.fish	431	%%DATADIR%%/completions/python.fish
Lines 459-464 Link Here
459	%%DATADIR%%/completions/set.fish	470	%%DATADIR%%/completions/set.fish
460	%%DATADIR%%/completions/set_color.fish	471	%%DATADIR%%/completions/set_color.fish
461	%%DATADIR%%/completions/setfacl.fish	472	%%DATADIR%%/completions/setfacl.fish
		473	%%DATADIR%%/completions/setsid.fish
462	%%DATADIR%%/completions/setxkbmap.fish	474	%%DATADIR%%/completions/setxkbmap.fish
463	%%DATADIR%%/completions/sha1sum.fish	475	%%DATADIR%%/completions/sha1sum.fish
464	%%DATADIR%%/completions/sha224sum.fish	476	%%DATADIR%%/completions/sha224sum.fish
Lines 488-493 Link Here
488	%%DATADIR%%/completions/tee.fish	500	%%DATADIR%%/completions/tee.fish
489	%%DATADIR%%/completions/telnet.fish	501	%%DATADIR%%/completions/telnet.fish
490	%%DATADIR%%/completions/termite.fish	502	%%DATADIR%%/completions/termite.fish
		503	%%DATADIR%%/completions/terraform.fish
491	%%DATADIR%%/completions/test.fish	504	%%DATADIR%%/completions/test.fish
492	%%DATADIR%%/completions/tex.fish	505	%%DATADIR%%/completions/tex.fish
493	%%DATADIR%%/completions/time.fish	506	%%DATADIR%%/completions/time.fish
Lines 515-520 Link Here
515	%%DATADIR%%/completions/update-eix-remote.fish	528	%%DATADIR%%/completions/update-eix-remote.fish
516	%%DATADIR%%/completions/update-eix.fish	529	%%DATADIR%%/completions/update-eix.fish
517	%%DATADIR%%/completions/useradd.fish	530	%%DATADIR%%/completions/useradd.fish
		531	%%DATADIR%%/completions/usermod.fish
518	%%DATADIR%%/completions/vagrant.fish	532	%%DATADIR%%/completions/vagrant.fish
519	%%DATADIR%%/completions/valgrind.fish	533	%%DATADIR%%/completions/valgrind.fish
520	%%DATADIR%%/completions/vared.fish	534	%%DATADIR%%/completions/vared.fish
Lines 541-546 Link Here
541	%%DATADIR%%/completions/xdvi.fish	555	%%DATADIR%%/completions/xdvi.fish
542	%%DATADIR%%/completions/xelatex.fish	556	%%DATADIR%%/completions/xelatex.fish
543	%%DATADIR%%/completions/xgettext.fish	557	%%DATADIR%%/completions/xgettext.fish
		558	%%DATADIR%%/completions/xinput.fish
544	%%DATADIR%%/completions/xmms.fish	559	%%DATADIR%%/completions/xmms.fish
545	%%DATADIR%%/completions/xpdf.fish	560	%%DATADIR%%/completions/xpdf.fish
546	%%DATADIR%%/completions/xprop.fish	561	%%DATADIR%%/completions/xprop.fish
Lines 550-555 Link Here
550	%%DATADIR%%/completions/xterm.fish	565	%%DATADIR%%/completions/xterm.fish
551	%%DATADIR%%/completions/xz.fish	566	%%DATADIR%%/completions/xz.fish
552	%%DATADIR%%/completions/yaourt.fish	567	%%DATADIR%%/completions/yaourt.fish
		568	%%DATADIR%%/completions/yarn.fish
553	%%DATADIR%%/completions/yast2.fish	569	%%DATADIR%%/completions/yast2.fish
554	%%DATADIR%%/completions/yum.fish	570	%%DATADIR%%/completions/yum.fish
555	%%DATADIR%%/completions/zcat.fish	571	%%DATADIR%%/completions/zcat.fish
Lines 562-567 Link Here
562	%%DATADIR%%/functions/__fish_bind_test1.fish	578	%%DATADIR%%/functions/__fish_bind_test1.fish
563	%%DATADIR%%/functions/__fish_bind_test2.fish	579	%%DATADIR%%/functions/__fish_bind_test2.fish
564	%%DATADIR%%/functions/__fish_cancel_commandline.fish	580	%%DATADIR%%/functions/__fish_cancel_commandline.fish
		581	%%DATADIR%%/functions/__fish_commandline_is_singlequoted.fish
565	%%DATADIR%%/functions/__fish_commandline_test.fish	582	%%DATADIR%%/functions/__fish_commandline_test.fish
566	%%DATADIR%%/functions/__fish_complete_abook_formats.fish	583	%%DATADIR%%/functions/__fish_complete_abook_formats.fish
567	%%DATADIR%%/functions/__fish_complete_ant_targets.fish	584	%%DATADIR%%/functions/__fish_complete_ant_targets.fish
Lines 581-586 Link Here
581	%%DATADIR%%/functions/__fish_complete_lpr_option.fish	598	%%DATADIR%%/functions/__fish_complete_lpr_option.fish
582	%%DATADIR%%/functions/__fish_complete_lsusb.fish	599	%%DATADIR%%/functions/__fish_complete_lsusb.fish
583	%%DATADIR%%/functions/__fish_complete_man.fish	600	%%DATADIR%%/functions/__fish_complete_man.fish
		601	%%DATADIR%%/functions/__fish_complete_mount_opts.fish
584	%%DATADIR%%/functions/__fish_complete_path.fish	602	%%DATADIR%%/functions/__fish_complete_path.fish
585	%%DATADIR%%/functions/__fish_complete_pgrep.fish	603	%%DATADIR%%/functions/__fish_complete_pgrep.fish
586	%%DATADIR%%/functions/__fish_complete_pids.fish	604	%%DATADIR%%/functions/__fish_complete_pids.fish
Lines 608-613 Link Here
608	%%DATADIR%%/functions/__fish_gnu_complete.fish	626	%%DATADIR%%/functions/__fish_gnu_complete.fish
609	%%DATADIR%%/functions/__fish_hg_prompt.fish	627	%%DATADIR%%/functions/__fish_hg_prompt.fish
610	%%DATADIR%%/functions/__fish_is_first_token.fish	628	%%DATADIR%%/functions/__fish_is_first_token.fish
		629	%%DATADIR%%/functions/__fish_is_git_repository.fish
611	%%DATADIR%%/functions/__fish_is_token_n.fish	630	%%DATADIR%%/functions/__fish_is_token_n.fish
612	%%DATADIR%%/functions/__fish_list_current_token.fish	631	%%DATADIR%%/functions/__fish_list_current_token.fish
613	%%DATADIR%%/functions/__fish_make_completion_signals.fish	632	%%DATADIR%%/functions/__fish_make_completion_signals.fish
Lines 704-709 Link Here
704	%%DATADIR%%/functions/fish_hybrid_key_bindings.fish	723	%%DATADIR%%/functions/fish_hybrid_key_bindings.fish
705	%%DATADIR%%/functions/fish_indent.fish	724	%%DATADIR%%/functions/fish_indent.fish
706	%%DATADIR%%/functions/fish_key_reader.fish	725	%%DATADIR%%/functions/fish_key_reader.fish
		726	%%DATADIR%%/functions/fish_md5.fish
707	%%DATADIR%%/functions/fish_mode_prompt.fish	727	%%DATADIR%%/functions/fish_mode_prompt.fish
708	%%DATADIR%%/functions/fish_prompt.fish	728	%%DATADIR%%/functions/fish_prompt.fish
709	%%DATADIR%%/functions/fish_update_completions.fish	729	%%DATADIR%%/functions/fish_update_completions.fish
Lines 763-768 Link Here
763	%%DATADIR%%/man/man1/count.1.gz	783	%%DATADIR%%/man/man1/count.1.gz
764	%%DATADIR%%/man/man1/dirh.1.gz	784	%%DATADIR%%/man/man1/dirh.1.gz
765	%%DATADIR%%/man/man1/dirs.1.gz	785	%%DATADIR%%/man/man1/dirs.1.gz
		786	%%DATADIR%%/man/man1/disown.1.gz
766	%%DATADIR%%/man/man1/echo.1.gz	787	%%DATADIR%%/man/man1/echo.1.gz
767	%%DATADIR%%/man/man1/else.1.gz	788	%%DATADIR%%/man/man1/else.1.gz
768	%%DATADIR%%/man/man1/emit.1.gz	789	%%DATADIR%%/man/man1/emit.1.gz
Lines 828-833 Link Here
828	%%DATADIR%%/tools/web_config/favicon.png	849	%%DATADIR%%/tools/web_config/favicon.png
829	%%DATADIR%%/tools/web_config/fishconfig.css	850	%%DATADIR%%/tools/web_config/fishconfig.css
830	%%DATADIR%%/tools/web_config/index.html	851	%%DATADIR%%/tools/web_config/index.html
		852	%%DATADIR%%/tools/web_config/js/angular-sanitize.js
831	%%DATADIR%%/tools/web_config/js/angular.js	853	%%DATADIR%%/tools/web_config/js/angular.js
832	%%DATADIR%%/tools/web_config/js/app.js	854	%%DATADIR%%/tools/web_config/js/app.js
833	%%DATADIR%%/tools/web_config/js/colorutils.js	855	%%DATADIR%%/tools/web_config/js/colorutils.js
Lines 861-866 Link Here
861	%%NLS%%share/locale/de/LC_MESSAGES/fish.mo	883	%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
862	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo	884	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
863	%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo	885	%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
		886	%%NLS%%share/locale/nb/LC_MESSAGES/fish.mo
		887	%%NLS%%share/locale/nn/LC_MESSAGES/fish.mo
864	%%NLS%%share/locale/pl/LC_MESSAGES/fish.mo	888	%%NLS%%share/locale/pl/LC_MESSAGES/fish.mo
865	%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo	889	%%NLS%%share/locale/pt_BR/LC_MESSAGES/fish.mo
866	%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo	890	%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo