Tue Feb 18 22:00:49 2020 UTC ()
fish: update to 3.1.0

From Jonathan Schleifer in PR pkg/54965,
lightly changed by myself for netbsd support.

fish 3.1.0 (released February 12, 2020)

Compared to the beta release of fish 3.1b1, fish version 3.1.0:

* fixes a regression where spaces after a brace were removed despite
  brace expansion not occurring (#6564)
* fixes a number of problems in compiling and testing on Cygwin (#6549)
  and Solaris-derived systems such as Illumos (#6553, #6554, #6555,
  #6556, and #6558);
* fixes the process for building macOS packages;
* fixes a regression where excessive error messages are printed if
  Unicode characters are emitted in non-Unicode-capable locales
  (#6584); and
* contains some improvements to the documentation and a small number of
  completions.

If you are upgrading from version 3.0.0 or before, please also review
the release notes for 3.1b1 (included below).

Release notes for fish 3.1b1 (released January 26, 2020)

Notable improvements and fixes

* A new $pipestatus variable contains a list of exit statuses of the
  previous job, for each of the separate commands in a pipeline
  (#5632).
* fish no longer buffers pipes to the last function in a pipeline,
  improving many cases where pipes appeared to block or hang (#1396).
* An overhaul of error messages for builtin commands, including a
  removal of the overwhelming usage summary, more readable stack traces
  (#3404, #5434), and stack traces for test (aka [) (#5771).
* fish's debugging arguments have been significantly improved. The
  --debug-level option has been removed, and a new --debug option
  replaces it. This option accepts various categories, which may be listed
  via fish --print-debug-categories (#5879). A new --debug-output option
  allows for redirection of debug output.
* string has a new collect subcommand for use in command substitutions,
  producing a single output instead of splitting on new lines (similar
  to "$(cmd)" in other shells) (#159).
* The fish manual, tutorial and FAQ are now available in man format as
  fish-doc, fish-tutorial and fish-faq respectively (#5521).
* Like other shells, cd now always looks for its argument in the
  current directory as a last resort, even if the CDPATH variable does
  not include it or "." (#4484).
* fish now correctly handles CDPATH entries that start with .. (#6220)
  or contain ./ (#5887).
* The fish_trace variable may be set to trace execution (#3427). This
  performs a similar role as set -x in other shells.
* fish uses the temporary directory determined by the system, rather
  than relying on /tmp (#3845).
* The fish Web configuration tool (fish_config) prints a list of
  commands it is executing, to help understanding and debugging
  (#5584).
* Major performance improvements when pasting (#5866), executing lots
  of commands (#5905), importing history from bash (#6295), and when
  completing variables that might match $history (#6288).

    Syntax changes and new commands

* A new builtin command, time, which allows timing of fish functions
  and builtins as well as external commands (#117).
* Brace expansion now only takes place if the braces include a "," or a
  variable expansion, meaning common commands such as git reset
  HEAD@{0} do not require escaping (#5869).
* New redirections &> and &| may be used to redirect or pipe stdout,
  and also redirect stderr to stdout (#6192).
* switch now allows arguments that expand to nothing, like empty
  variables (#5677).
* The VAR=val cmd syntax can now be used to run a command in a modified
  environment (#6287).
* and is no longer recognised as a command, so that nonsensical
  constructs like and and and produce a syntax error (#6089).
* math's exponent operator, '^', was previously left-associative, but
  now uses the more commonly-used right-associative behaviour (#6280).
  This means that math '3^0.5^2' was previously calculated as
  '(3^0.5)^2', but is now calculated as '3^(0.5^2)'.
* In fish 3.0, the variable used with for loops inside command
  substitutions could leak into enclosing scopes; this was an
  inadvertent behaviour change and has been reverted (#6480).

    Scripting improvements

* string split0 now returns 0 if it split something (#5701).
* In the interest of consistency, builtin -q and command -q can now be
  used to query if a builtin or command exists (#5631).
* math now accepts --scale=max for the maximum scale (#5579).
* builtin $var now works correctly, allowing a variable as the builtin
  name (#5639).
* cd understands the -- argument to make it possible to change to
  directories starting with a hyphen (#6071).
* complete --do-complete now also does fuzzy matches (#5467).
* complete --do-complete can be used inside completions, allowing
  limited recursion (#3474).
* count now also counts lines fed on standard input (#5744).
* eval produces an exit status of 0 when given no arguments, like other
  shells (#5692).
* printf prints what it can when input hasn't been fully converted to a
  number, but still prints an error (#5532).
* complete -C foo now works as expected, rather than requiring complete
  -Cfoo.
* complete has a new --force-files option, to re-enable file
  completions. This allows sudo -E and pacman -Qo to complete correctly
  (#5646).
* argparse now defaults to showing the current function name (instead
  of argparse) in its errors, making --name often superfluous (#5835).
* argparse has a new --ignore-unknown option to keep unrecognized
  options, allowing multiple argparse passes to parse options (#5367).
* argparse correctly handles flag value validation of options that only
  have short names (#5864).
* read -S (short option of --shell) is recognised correctly (#5660).
* read understands --list, which acts like --array in reading all
  arguments into a list inside a single variable, but is better named
  (#5846).
* read has a new option, --tokenize, which splits a string into
  variables according to the shell's tokenization rules, considering
  quoting, escaping, and so on (#3823).
* read interacts more correctly with the deprecated $IFS variable, in
  particular removing multiple separators when splitting a variable
  into a list (#6406), matching other shells.
* fish_indent now handles semicolons better, including leaving them in
  place for ; and and ; or instead of breaking the line (#5859).
* fish_indent --write now supports multiple file arguments, indenting
  them in turn.
* The default read limit has been increased to 100MiB (#5267).
* math now also understands x for multiplication, provided it is
  followed by whitespace (#5906).
* math reports the right error when incorrect syntax is used inside
  parentheses (#6063), and warns when unsupported logical operations
  are used (#6096).
* functions --erase now also prevents fish from autoloading a function
  for the first time (#5951).
* jobs --last returns 0 to indicate success when a job is found
  (#6104).
* commandline -p and commandline -j now split on && and || in addition
  to ; and & (#6214).
* A bug where string split would drop empty strings if the output was
  only empty strings has been fixed (#5987).
* eval no long creates a new local variable scope, but affects
  variables in the scope it is called from (#4443). source still
  creates a new local scope.
* abbr has a new --query option to check for the existence of an
  abbreviation.
* Local values for fish_complete_path and fish_function_path are now
  ignored; only their global values are respected.
* Syntax error reports now display a marker in the correct position
  (#5812).
* Empty universal variables may now be exported (#5992).
* Exported universal variables are no longer imported into the global
  scope, preventing shadowing. This makes it easier to change such
  variables for all fish sessions and avoids breakage when the value is
  a list of multiple elements (#5258).
* A bug where for could use invalid variable names has been fixed
  (#5800).
* A bug where local variables would not be exported to functions has
  been fixed (#6153).
* The null command (:) now always exits successfully, rather than
  passing through the previous exit status (#6022).
* The output of functions FUNCTION matches the declaration of the
  function, correctly including comments or blank lines (#5285), and
  correctly includes any --wraps flags (#1625).
* type supports a new option, --short, which suppress function
  expansion (#6403).
* type --path with a function argument will now output the path to the
  file containing the definition of that function, if it exists.
* type --force-path with an argument that cannot be found now correctly
  outputs nothing, as documented (#6411).
* The $hostname variable is no longer truncated to 32 characters
  (#5758).
* Line numbers in function backtraces are calculated correctly (#6350).
* A new fish_cancel event is emitted when the command line is
  cancelled, which is useful for terminal integration (#5973).

    Interactive improvements

* New Base16 color options are available through the Web-based
  configuration (#6504).
* fish only parses /etc/paths on macOS in login shells, matching the
  bash implementation (#5637) and avoiding changes to path ordering in
  child shells (#5456). It now ignores blank lines like the bash
  implementation (#5809).
* The locale is now reloaded when the LOCPATH variable is changed
  (#5815).
* read no longer keeps a history, making it suitable for operations
  that shouldn't end up there, like password entry (#5904).
* dirh outputs its stack in the correct order (#5477), and behaves as
  documented when universal variables are used for its stack (#5797).
* funced and the edit-commandline-in-buffer bindings did not work in
  fish 3.0 when the $EDITOR variable contained spaces; this has been
  corrected (#5625).
* Builtins now pipe their help output to a pager automatically (#6227).
* set_color now colors the --print-colors output in the matching colors
  if it is going to a terminal.
* fish now underlines every valid entered path instead of just the last
  one (#5872).
* When syntax highlighting a string with an unclosed quote, only the
  quote itself will be shown as an error, instead of the whole
  argument.
* Syntax highlighting works correctly with variables as commands
  (#5658) and redirections to close file descriptors (#6092).
* help works properly on Windows Subsytem for Linux (#5759, #6338).
* A bug where disown could crash the shell has been fixed (#5720).
* fish will not autosuggest files ending with ~ unless there are no
  other candidates, as these are generally backup files (#985).
* Escape in the pager works correctly (#5818).
* Key bindings that call fg no longer leave the terminal in a broken
  state (#2114).
* Brackets (#5831) and filenames containing $ (#6060) are completed
  with appropriate escaping.
* The output of complete and functions is now colorized in interactive
  terminals.
* The Web-based configuration handles aliases that include single
  quotes correctly (#6120), and launches correctly under Termux (#6248)
  and OpenBSD (#6522).
* function now correctly validates parameters for --argument-names as
  valid variable names (#6147) and correctly parses options following
  --argument-names, as in "--argument-names foo --description bar"
  (#6186).
* History newly imported from bash includes command lines using && or
  ||.
* The automatic generation of completions from manual pages is better
  described in job and process listings, and no longer produces a
  warning when exiting fish (#6269).
* In private mode, setting $fish_greeting to an empty string before
  starting the private session will prevent the warning about history
  not being saved from being printed (#6299).
* In the interactive editor, a line break (Enter) inside unclosed
  brackets will insert a new line, rather than executing the command
  and producing an error (#6316).
* Ctrl-C always repaints the prompt (#6394).
* When run interactively from another program (such as Python), fish
  will correctly start a new process group, like other shells (#5909).
* Job identifiers (for example, for background jobs) are assigned more
  logically (#6053).
* A bug where history would appear truncated if an empty command was
  executed was fixed (#6032).

    New or improved bindings

* Pasting strips leading spaces to avoid pasted commands being omitted
  from the history (#4327).
* Shift-Left and Shift-Right now default to moving backwards and
  forwards by one bigword (words separated by whitespace) (#1505).
* The default escape delay (to differentiate between the escape key and
  an alt-combination) has been reduced to 30ms, down from 300ms for the
  default mode and 100ms for Vi mode (#3904).
* The forward-bigword binding now interacts correctly with
  autosuggestions (#5336).
* The fish_clipboard_* functions support Wayland by using
  [wl-clipboard](https://github.com/bugaevc/wl-clipboard) (#5450).
* The nextd and prevd functions no longer print "Hit end of history",
  instead using a bell. They correctly store working directories
  containing symbolic links (#6395).
* If a fish_mode_prompt function exists, Vi mode will only execute it
  on mode-switch instead of the entire prompt. This should make it much
  more responsive with slow prompts (#5783).
* The path-component bindings (like Ctrl-w) now also stop at ":" and
  "@", because those are used to denote user and host in commands such
  as ssh (#5841).
* The NULL character can now be bound via bind -k nul. Terminals often
  generate this character via control-space. (#3189).
* A new readline command expand-abbr can be used to trigger
  abbreviation expansion (#5762).
* A new readline command, delete-or-exit, removes a character to the
  right of the cursor or exits the shell if the command line is empty
  (moving this functionality out of the delete-or-exit function).
* The self-insert readline command will now insert the binding
  sequence, if not empty.
* A new binding to prepend sudo, bound to Alt-S by default (#6140).
* The Alt-W binding to describe a command should now work better with
  multiline prompts (#6110)
* The Alt-H binding to open a command's man page now tries to ignore
  sudo (#6122).
* A new pair of bind functions, history-prefix-search-backward (and
  forward), was introduced (#6143).
* Vi mode now supports R to enter replace mode (#6342), and d0 to
  delete the current line (#6292).
* In Vi mode, hitting Enter in replace-one mode no longer erases the
  prompt (#6298).
* Selections in Vi mode are inclusive, matching the actual behaviour of
  Vi (#5770).

    Improved prompts

* The Git prompt in informative mode now shows the number of stashes if
  enabled.
* The Git prompt now has an option
  ($__fish_git_prompt_use_informative_chars) to use the (more modern)
  informative characters without enabling informative mode.
* The default prompt now also features VCS integration and will color
  the host if running via SSH (#6375).
* The default and example prompts print the pipe status if an earlier
  command in the pipe fails.
* The default and example prompts try to resolve exit statuses to
  signal names when appropriate.

    Improved terminal output

* New fish_pager_color_ options have been added to control more
  elements of the pager's colors (#5524).
* Better detection and support for using fish from various system
  consoles, where limited colors and special characters are supported
  (#5552).
* fish now tries to guess if the system supports Unicode 9 (and
  displays emoji as wide), eliminating the need to set
  $fish_emoji_width in most cases (#5722).
* Improvements to the display of wide characters, particularly Korean
  characters and emoji (#5583, #5729).
* The Vi mode cursor is correctly redrawn when regaining focus under
  terminals that report focus (eg tmux) (#4788).
* Variables that control background colors (such as
  fish_pager_color_search_match) can now use --reverse.

    Completions

* Added completions for
* aws
* bat (#6052)
* bosh (#5700)
* btrfs
* camcontrol
* cf (#5700)
* chronyc (#6496)
* code (#6205)
* cryptsetup (#6488)
* csc and csi (#6016)
* cwebp (#6034)
* cygpath and cygstart (#6239)
* epkginfo (#5829)
* ffmpeg, ffplay, and ffprobe (#5922)
* fsharpc and fsharpi (#6016)
* fzf (#6178)
* g++ (#6217)
* gpg1 (#6139)
* gpg2 (#6062)
* grub-mkrescue (#6182)
* hledger (#6043)
* hwinfo (#6496)
* irb (#6260)
* iw (#6232)
* kak
* keepassxc-cli (#6505)
* keybase (#6410)
* loginctl (#6501)
* lz4, lz4c and lz4cat (#6364)
* mariner (#5718)
* nethack (#6240)
* patool (#6083)
* phpunit (#6197)
* plutil (#6301)
* pzstd (#6364)
* qubes-gpg-client (#6067)
* resolvectl (#6501)
* rg
* rustup
* sfdx (#6149)
* speedtest and speedtest-cli (#5840)
* src (#6026)
* tokei (#6085)
* tsc (#6016)
* unlz4 (#6364)
* unzstd (#6364)
* vbc (#6016)
* zpaq (#6245)
* zstd, zstdcat, zstdgrep, zstdless and zstdmt (#6364)
* Lots of improvements to completions.
* Selecting short options which also have a long name from the
  completion pager is possible (#5634).
* Tab completion will no longer add trailing spaces if they already
  exist (#6107).
* Completion of subcommands to builtins like and or not now works
  correctly (#6249).
* Completion of arguments to short options works correctly when
  multiple short options are used together (#332).
* Activating completion in the middle of an invalid completion does not
  move the cursor any more, making it easier to fix a mistake (#4124).
* Completion in empty commandlines now lists all available commands.
* Functions listed as completions could previously leak parts of the
  function as other completions; this has been fixed.

    Deprecations and removed features

* The vcs-prompt functions have been promoted to names without
  double-underscore, so __fish_git_prompt is now fish_git_prompt,
  __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now
  fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at
  the old names have been added, and the variables have kept their old
  names (#5586).
* string replace has an additional round of escaping in the replacement
  expression, so escaping backslashes requires many escapes (eg string
  replace -ra '([ab])' '\\\\\\\$1' a). The new feature flag
  regex-easyesc can be used to disable this, so that the same effect
  can be achieved with string replace -ra '([ab])' '\\\\$1' a (#5556).
  As a reminder, the intention behind feature flags is that this will
  eventually become the default and then only option, so scripts should
  be updated.
* The fish_vi_mode function, deprecated in fish 2.3, has been removed.
  Use fish_vi_key_bindings instead (#6372).

    For distributors and developers

* fish 3.0 introduced a CMake-based build system. In fish 3.1, both the
  Autotools-based build and legacy Xcode build system have been
  removed, leaving only the CMake build system. All distributors and
  developers must install CMake.
* fish now depends on the common tee external command, for the psub
  process substitution function.
* The documentation is now built with Sphinx. The old Doxygen-based
  documentation system has been removed. Developers, and distributors
  who wish to rebuild the documentation, must install Sphinx.
* The INTERNAL_WCWIDTH build option has been removed, as fish now
  always uses an internal wcwidth function. It has a number of
  configuration options that make it more suitable for general use
  (#5777).
* mandoc can now be used to format the output from --help if nroff is
  not installed, reducing the number of external dependencies on
  systems with mandoc installed (#5489).
* Some bugs preventing building on Solaris-derived systems such as
  Illumos were fixed (#5458, #5461, #5611).
* Completions for npm, bower and yarn no longer require the jq utility
  for full functionality, but will use Python instead if it is
  available.
* The paths for completions, functions and configuration snippets have
  been extended. On systems that define XDG_DATA_DIRS, each of the
  directories in this variable are searched in the subdirectories
  fish/vendor_completions.d, fish/vendor_functions.d, and
  fish/vendor_conf.d respectively. On systems that do not define this
  variable in the environment, the vendor directories are searched for
  in both the installation prefix and the default "extra" directory,
  which now defaults to /usr/local (#5029).


(maya)
diff -r1.21 -r1.22 pkgsrc/shells/fish/Makefile
diff -r1.7 -r1.8 pkgsrc/shells/fish/PLIST
diff -r1.15 -r1.16 pkgsrc/shells/fish/distinfo
diff -r1.2 -r0 pkgsrc/shells/fish/options.mk
diff -r1.4 -r0 pkgsrc/shells/fish/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake
diff -r0 -r1.1 pkgsrc/shells/fish/patches/patch-config__cmake.h.in
diff -r0 -r1.1 pkgsrc/shells/fish/patches/patch-src_common.cpp
diff -r1.3 -r0 pkgsrc/shells/fish/patches/patch-configure.ac
diff -r1.3 -r0 pkgsrc/shells/fish/patches/patch-src_fallback.h
diff -r1.3 -r0 pkgsrc/shells/fish/patches/patch-src_output.cpp
diff -r1.3 -r0 pkgsrc/shells/fish/patches/patch-src_output.h
diff -r1.3 -r0 pkgsrc/shells/fish/patches/patch-src_screen.cpp
diff -r1.1 -r0 pkgsrc/shells/fish/patches/patch-share_functions_man.fish
diff -r1.1 -r0 pkgsrc/shells/fish/patches/patch-src_builtin.cpp
diff -r1.2 -r1.3 pkgsrc/shells/fish/patches/patch-src_fallback.cpp
diff -r1.3 -r1.4 pkgsrc/shells/fish/patches/patch-src_wutil.cpp

cvs diff -r1.21 -r1.22 pkgsrc/shells/fish/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/fish/Makefile 2019/11/09 12:02:29 1.21
+++ pkgsrc/shells/fish/Makefile 2020/02/18 22:00:49 1.22
@@ -1,59 +1,50 @@ @@ -1,59 +1,50 @@
1# $NetBSD: Makefile,v 1.21 2019/11/09 12:02:29 nia Exp $ 1# $NetBSD: Makefile,v 1.22 2020/02/18 22:00:49 maya Exp $
2 2
3DISTNAME= fish-3.0.2 3DISTNAME= fish-3.1.0
4CATEGORIES= shells 4CATEGORIES= shells
5MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/}
6GITHUB_PROJECT= fish-shell 6GITHUB_PROJECT= fish-shell
 7GITHUB_RELEASE= 3.1.0
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.fishshell.com/ 10HOMEPAGE= http://www.fishshell.com/
10COMMENT= User friendly command line shell for UNIX-like operating systems 11COMMENT= User friendly command line shell for UNIX-like operating systems
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13EXTRACT_USING= gtar 14EXTRACT_USING= gtar
14 15
15WRKSRC= ${WRKDIR}/fish-shell-${PKGVERSION_NOREV} 
16 
17USE_LANGUAGES+= c c++03 16USE_LANGUAGES+= c c++03
18USE_LIBTOOL= yes 17USE_CMAKE= yes
19GNU_CONFIGURE= yes 
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 
21USE_TOOLS+= gmake autoreconf autoconf automake 
22USE_TOOLS+= msgfmt 18USE_TOOLS+= msgfmt
23 19CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include
24EGDIR= ${PREFIX}/share/examples 
25INSTALL_ENV+= EGDIR=${EGDIR} 
26 20
27PKG_SHELL= bin/fish 21PKG_SHELL= bin/fish
28 22
29REPLACE_PYTHON+= share/tools/*.py 23REPLACE_PYTHON+= share/tools/*.py
30REPLACE_PYTHON+= share/tools/web_config/webconfig.py 24REPLACE_PYTHON+= share/tools/web_config/webconfig.py
31 25
32LDFLAGS.SunOS+= -lintl 26LDFLAGS.SunOS+= -lintl
33 27
34.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
35 29
36.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) 30.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
37CPPFLAGS+= -DHAVE_BACKTRACE 31CPPFLAGS+= -DHAVE_BACKTRACE
38CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS 32CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS
39CXXFLAGS.NetBSD+= -fpermissive 33CXXFLAGS.NetBSD+= -fpermissive
40LDFLAGS+= -lexecinfo 34LDFLAGS+= -lexecinfo
41.endif 35.endif
42 36
43# Upstream intentionally omits open.1 on Darwin 37# Upstream intentionally omits open.1 on Darwin, but adds realpath.1
44PLIST_VARS+= open 38PLIST_VARS+= open realpath
45.if ${OPSYS} != "Darwin" 39.if ${OPSYS} == "Darwin"
 40PLIST.realpath= yes
 41.else
46PLIST.open= yes 42PLIST.open= yes
47.endif 43.endif
48 44
49pre-configure: 
50 ${RUN} cd ${WRKSRC} && autoreconf -fiv 
51 
52.include "options.mk" 
53 
54.include "../../devel/pcre2/buildlink3.mk" 45.include "../../devel/pcre2/buildlink3.mk"
55.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
56.include "../../devel/gettext-tools/buildlink3.mk" 47.include "../../devel/gettext-tools/buildlink3.mk"
57.include "../../lang/python/application.mk" 48.include "../../lang/python/application.mk"
58.include "../../mk/curses.buildlink3.mk" 49.include "../../mk/curses.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"

cvs diff -r1.7 -r1.8 pkgsrc/shells/fish/PLIST (expand / switch to unified diff)

--- pkgsrc/shells/fish/PLIST 2019/02/12 16:49:31 1.7
+++ pkgsrc/shells/fish/PLIST 2020/02/18 22:00:49 1.8
@@ -1,30 +1,269 @@ @@ -1,30 +1,269 @@
1@comment $NetBSD: PLIST,v 1.7 2019/02/12 16:49:31 maya Exp $ 1@comment $NetBSD: PLIST,v 1.8 2020/02/18 22:00:49 maya Exp $
2bin/fish 2bin/fish
3bin/fish_indent 3bin/fish_indent
4bin/fish_key_reader 4bin/fish_key_reader
5${PLIST.doc}man/man1/fish.1 5etc/fish/config.fish
6${PLIST.doc}man/man1/fish_indent.1 6man/man1/fish.1
7${PLIST.doc}man/man1/fish_key_reader.1 7man/man1/fish_indent.1
 8man/man1/fish_key_reader.1
 9share/doc/fish/.buildinfo
8share/doc/fish/CHANGELOG.md 10share/doc/fish/CHANGELOG.md
9${PLIST.doc}share/doc/fish/ascii_fish.png 11share/doc/fish/_sources/cmds/abbr.rst.txt
10${PLIST.doc}share/doc/fish/commands.html 12share/doc/fish/_sources/cmds/alias.rst.txt
11${PLIST.doc}share/doc/fish/design.html 13share/doc/fish/_sources/cmds/and.rst.txt
12${PLIST.doc}share/doc/fish/faq.html 14share/doc/fish/_sources/cmds/argparse.rst.txt
13${PLIST.doc}share/doc/fish/index.html 15share/doc/fish/_sources/cmds/begin.rst.txt
14${PLIST.doc}share/doc/fish/license.html 16share/doc/fish/_sources/cmds/bg.rst.txt
15${PLIST.doc}share/doc/fish/tutorial.html 17share/doc/fish/_sources/cmds/bind.rst.txt
16${PLIST.doc}share/doc/fish/user_doc.css 18share/doc/fish/_sources/cmds/block.rst.txt
17share/examples/fish/config.fish 19share/doc/fish/_sources/cmds/break.rst.txt
 20share/doc/fish/_sources/cmds/breakpoint.rst.txt
 21share/doc/fish/_sources/cmds/builtin.rst.txt
 22share/doc/fish/_sources/cmds/case.rst.txt
 23share/doc/fish/_sources/cmds/cd.rst.txt
 24share/doc/fish/_sources/cmds/cdh.rst.txt
 25share/doc/fish/_sources/cmds/command.rst.txt
 26share/doc/fish/_sources/cmds/commandline.rst.txt
 27share/doc/fish/_sources/cmds/complete.rst.txt
 28share/doc/fish/_sources/cmds/contains.rst.txt
 29share/doc/fish/_sources/cmds/continue.rst.txt
 30share/doc/fish/_sources/cmds/count.rst.txt
 31share/doc/fish/_sources/cmds/dirh.rst.txt
 32share/doc/fish/_sources/cmds/dirs.rst.txt
 33share/doc/fish/_sources/cmds/disown.rst.txt
 34share/doc/fish/_sources/cmds/echo.rst.txt
 35share/doc/fish/_sources/cmds/else.rst.txt
 36share/doc/fish/_sources/cmds/emit.rst.txt
 37share/doc/fish/_sources/cmds/end.rst.txt
 38share/doc/fish/_sources/cmds/eval.rst.txt
 39share/doc/fish/_sources/cmds/exec.rst.txt
 40share/doc/fish/_sources/cmds/exit.rst.txt
 41share/doc/fish/_sources/cmds/false.rst.txt
 42share/doc/fish/_sources/cmds/fg.rst.txt
 43share/doc/fish/_sources/cmds/fish.rst.txt
 44share/doc/fish/_sources/cmds/fish_breakpoint_prompt.rst.txt
 45share/doc/fish/_sources/cmds/fish_config.rst.txt
 46share/doc/fish/_sources/cmds/fish_git_prompt.rst.txt
 47share/doc/fish/_sources/cmds/fish_hg_prompt.rst.txt
 48share/doc/fish/_sources/cmds/fish_indent.rst.txt
 49share/doc/fish/_sources/cmds/fish_key_reader.rst.txt
 50share/doc/fish/_sources/cmds/fish_mode_prompt.rst.txt
 51share/doc/fish/_sources/cmds/fish_opt.rst.txt
 52share/doc/fish/_sources/cmds/fish_prompt.rst.txt
 53share/doc/fish/_sources/cmds/fish_right_prompt.rst.txt
 54share/doc/fish/_sources/cmds/fish_svn_prompt.rst.txt
 55share/doc/fish/_sources/cmds/fish_update_completions.rst.txt
 56share/doc/fish/_sources/cmds/fish_vcs_prompt.rst.txt
 57share/doc/fish/_sources/cmds/for.rst.txt
 58share/doc/fish/_sources/cmds/funced.rst.txt
 59share/doc/fish/_sources/cmds/funcsave.rst.txt
 60share/doc/fish/_sources/cmds/function.rst.txt
 61share/doc/fish/_sources/cmds/functions.rst.txt
 62share/doc/fish/_sources/cmds/help.rst.txt
 63share/doc/fish/_sources/cmds/history.rst.txt
 64share/doc/fish/_sources/cmds/if.rst.txt
 65share/doc/fish/_sources/cmds/isatty.rst.txt
 66share/doc/fish/_sources/cmds/jobs.rst.txt
 67share/doc/fish/_sources/cmds/math.rst.txt
 68share/doc/fish/_sources/cmds/nextd.rst.txt
 69share/doc/fish/_sources/cmds/not.rst.txt
 70share/doc/fish/_sources/cmds/open.rst.txt
 71share/doc/fish/_sources/cmds/or.rst.txt
 72share/doc/fish/_sources/cmds/popd.rst.txt
 73share/doc/fish/_sources/cmds/prevd.rst.txt
 74share/doc/fish/_sources/cmds/printf.rst.txt
 75share/doc/fish/_sources/cmds/prompt_pwd.rst.txt
 76share/doc/fish/_sources/cmds/psub.rst.txt
 77share/doc/fish/_sources/cmds/pushd.rst.txt
 78share/doc/fish/_sources/cmds/pwd.rst.txt
 79share/doc/fish/_sources/cmds/random.rst.txt
 80share/doc/fish/_sources/cmds/read.rst.txt
 81share/doc/fish/_sources/cmds/realpath.rst.txt
 82share/doc/fish/_sources/cmds/return.rst.txt
 83share/doc/fish/_sources/cmds/set.rst.txt
 84share/doc/fish/_sources/cmds/set_color.rst.txt
 85share/doc/fish/_sources/cmds/source.rst.txt
 86share/doc/fish/_sources/cmds/status.rst.txt
 87share/doc/fish/_sources/cmds/string-collect.rst.txt
 88share/doc/fish/_sources/cmds/string-escape.rst.txt
 89share/doc/fish/_sources/cmds/string-join.rst.txt
 90share/doc/fish/_sources/cmds/string-join0.rst.txt
 91share/doc/fish/_sources/cmds/string-length.rst.txt
 92share/doc/fish/_sources/cmds/string-lower.rst.txt
 93share/doc/fish/_sources/cmds/string-match.rst.txt
 94share/doc/fish/_sources/cmds/string-repeat.rst.txt
 95share/doc/fish/_sources/cmds/string-replace.rst.txt
 96share/doc/fish/_sources/cmds/string-split.rst.txt
 97share/doc/fish/_sources/cmds/string-split0.rst.txt
 98share/doc/fish/_sources/cmds/string-sub.rst.txt
 99share/doc/fish/_sources/cmds/string-trim.rst.txt
 100share/doc/fish/_sources/cmds/string-unescape.rst.txt
 101share/doc/fish/_sources/cmds/string-upper.rst.txt
 102share/doc/fish/_sources/cmds/string.rst.txt
 103share/doc/fish/_sources/cmds/suspend.rst.txt
 104share/doc/fish/_sources/cmds/switch.rst.txt
 105share/doc/fish/_sources/cmds/test.rst.txt
 106share/doc/fish/_sources/cmds/time.rst.txt
 107share/doc/fish/_sources/cmds/trap.rst.txt
 108share/doc/fish/_sources/cmds/true.rst.txt
 109share/doc/fish/_sources/cmds/type.rst.txt
 110share/doc/fish/_sources/cmds/ulimit.rst.txt
 111share/doc/fish/_sources/cmds/umask.rst.txt
 112share/doc/fish/_sources/cmds/vared.rst.txt
 113share/doc/fish/_sources/cmds/wait.rst.txt
 114share/doc/fish/_sources/cmds/while.rst.txt
 115share/doc/fish/_sources/commands.rst.txt
 116share/doc/fish/_sources/design.rst.txt
 117share/doc/fish/_sources/faq.rst.txt
 118share/doc/fish/_sources/index.rst.txt
 119share/doc/fish/_sources/license.rst.txt
 120share/doc/fish/_sources/tutorial.rst.txt
 121share/doc/fish/_static/ajax-loader.gif
 122share/doc/fish/_static/basic.css
 123share/doc/fish/_static/comment-bright.png
 124share/doc/fish/_static/comment-close.png
 125share/doc/fish/_static/comment.png
 126share/doc/fish/_static/custom.css
 127share/doc/fish/_static/doctools.js
 128share/doc/fish/_static/documentation_options.js
 129share/doc/fish/_static/down-pressed.png
 130share/doc/fish/_static/down.png
 131share/doc/fish/_static/file.png
 132share/doc/fish/_static/jquery.js
 133share/doc/fish/_static/language_data.js
 134share/doc/fish/_static/minus.png
 135share/doc/fish/_static/nature.css
 136share/doc/fish/_static/plus.png
 137share/doc/fish/_static/pygments.css
 138share/doc/fish/_static/searchtools.js
 139share/doc/fish/_static/underscore.js
 140share/doc/fish/_static/up-pressed.png
 141share/doc/fish/_static/up.png
 142share/doc/fish/_static/websupport.js
 143share/doc/fish/cmds/abbr.html
 144share/doc/fish/cmds/alias.html
 145share/doc/fish/cmds/and.html
 146share/doc/fish/cmds/argparse.html
 147share/doc/fish/cmds/begin.html
 148share/doc/fish/cmds/bg.html
 149share/doc/fish/cmds/bind.html
 150share/doc/fish/cmds/block.html
 151share/doc/fish/cmds/break.html
 152share/doc/fish/cmds/breakpoint.html
 153share/doc/fish/cmds/builtin.html
 154share/doc/fish/cmds/case.html
 155share/doc/fish/cmds/cd.html
 156share/doc/fish/cmds/cdh.html
 157share/doc/fish/cmds/command.html
 158share/doc/fish/cmds/commandline.html
 159share/doc/fish/cmds/complete.html
 160share/doc/fish/cmds/contains.html
 161share/doc/fish/cmds/continue.html
 162share/doc/fish/cmds/count.html
 163share/doc/fish/cmds/dirh.html
 164share/doc/fish/cmds/dirs.html
 165share/doc/fish/cmds/disown.html
 166share/doc/fish/cmds/echo.html
 167share/doc/fish/cmds/else.html
 168share/doc/fish/cmds/emit.html
 169share/doc/fish/cmds/end.html
 170share/doc/fish/cmds/eval.html
 171share/doc/fish/cmds/exec.html
 172share/doc/fish/cmds/exit.html
 173share/doc/fish/cmds/false.html
 174share/doc/fish/cmds/fg.html
 175share/doc/fish/cmds/fish.html
 176share/doc/fish/cmds/fish_breakpoint_prompt.html
 177share/doc/fish/cmds/fish_config.html
 178share/doc/fish/cmds/fish_git_prompt.html
 179share/doc/fish/cmds/fish_hg_prompt.html
 180share/doc/fish/cmds/fish_indent.html
 181share/doc/fish/cmds/fish_key_reader.html
 182share/doc/fish/cmds/fish_mode_prompt.html
 183share/doc/fish/cmds/fish_opt.html
 184share/doc/fish/cmds/fish_prompt.html
 185share/doc/fish/cmds/fish_right_prompt.html
 186share/doc/fish/cmds/fish_svn_prompt.html
 187share/doc/fish/cmds/fish_update_completions.html
 188share/doc/fish/cmds/fish_vcs_prompt.html
 189share/doc/fish/cmds/for.html
 190share/doc/fish/cmds/funced.html
 191share/doc/fish/cmds/funcsave.html
 192share/doc/fish/cmds/function.html
 193share/doc/fish/cmds/functions.html
 194share/doc/fish/cmds/help.html
 195share/doc/fish/cmds/history.html
 196share/doc/fish/cmds/if.html
 197share/doc/fish/cmds/isatty.html
 198share/doc/fish/cmds/jobs.html
 199share/doc/fish/cmds/math.html
 200share/doc/fish/cmds/nextd.html
 201share/doc/fish/cmds/not.html
 202share/doc/fish/cmds/open.html
 203share/doc/fish/cmds/or.html
 204share/doc/fish/cmds/popd.html
 205share/doc/fish/cmds/prevd.html
 206share/doc/fish/cmds/printf.html
 207share/doc/fish/cmds/prompt_pwd.html
 208share/doc/fish/cmds/psub.html
 209share/doc/fish/cmds/pushd.html
 210share/doc/fish/cmds/pwd.html
 211share/doc/fish/cmds/random.html
 212share/doc/fish/cmds/read.html
 213share/doc/fish/cmds/realpath.html
 214share/doc/fish/cmds/return.html
 215share/doc/fish/cmds/set.html
 216share/doc/fish/cmds/set_color.html
 217share/doc/fish/cmds/source.html
 218share/doc/fish/cmds/status.html
 219share/doc/fish/cmds/string-collect.html
 220share/doc/fish/cmds/string-escape.html
 221share/doc/fish/cmds/string-join.html
 222share/doc/fish/cmds/string-join0.html
 223share/doc/fish/cmds/string-length.html
 224share/doc/fish/cmds/string-lower.html
 225share/doc/fish/cmds/string-match.html
 226share/doc/fish/cmds/string-repeat.html
 227share/doc/fish/cmds/string-replace.html
 228share/doc/fish/cmds/string-split.html
 229share/doc/fish/cmds/string-split0.html
 230share/doc/fish/cmds/string-sub.html
 231share/doc/fish/cmds/string-trim.html
 232share/doc/fish/cmds/string-unescape.html
 233share/doc/fish/cmds/string-upper.html
 234share/doc/fish/cmds/string.html
 235share/doc/fish/cmds/suspend.html
 236share/doc/fish/cmds/switch.html
 237share/doc/fish/cmds/test.html
 238share/doc/fish/cmds/time.html
 239share/doc/fish/cmds/trap.html
 240share/doc/fish/cmds/true.html
 241share/doc/fish/cmds/type.html
 242share/doc/fish/cmds/ulimit.html
 243share/doc/fish/cmds/umask.html
 244share/doc/fish/cmds/vared.html
 245share/doc/fish/cmds/wait.html
 246share/doc/fish/cmds/while.html
 247share/doc/fish/commands.html
 248share/doc/fish/design.html
 249share/doc/fish/faq.html
 250share/doc/fish/genindex.html
 251share/doc/fish/index.html
 252share/doc/fish/license.html
 253share/doc/fish/objects.inv
 254share/doc/fish/search.html
 255share/doc/fish/searchindex.js
 256share/doc/fish/tutorial.html
18share/fish/__fish_build_paths.fish 257share/fish/__fish_build_paths.fish
19share/fish/completions/VBoxHeadless.fish 258share/fish/completions/VBoxHeadless.fish
20share/fish/completions/VBoxSDL.fish 259share/fish/completions/VBoxSDL.fish
21share/fish/completions/a2disconf.fish 260share/fish/completions/a2disconf.fish
22share/fish/completions/a2dismod.fish 261share/fish/completions/a2dismod.fish
23share/fish/completions/a2dissite.fish 262share/fish/completions/a2dissite.fish
24share/fish/completions/a2enconf.fish 263share/fish/completions/a2enconf.fish
25share/fish/completions/a2enmod.fish 264share/fish/completions/a2enmod.fish
26share/fish/completions/a2ensite.fish 265share/fish/completions/a2ensite.fish
27share/fish/completions/abbr.fish 266share/fish/completions/abbr.fish
28share/fish/completions/abook.fish 267share/fish/completions/abook.fish
29share/fish/completions/acat.fish 268share/fish/completions/acat.fish
30share/fish/completions/accept.fish 269share/fish/completions/accept.fish
@@ -76,269 +315,307 @@ share/fish/completions/arc.fish @@ -76,269 +315,307 @@ share/fish/completions/arc.fish
76share/fish/completions/arepack.fish 315share/fish/completions/arepack.fish
77share/fish/completions/arp.fish 316share/fish/completions/arp.fish
78share/fish/completions/as.fish 317share/fish/completions/as.fish
79share/fish/completions/asp.fish 318share/fish/completions/asp.fish
80share/fish/completions/at.fish 319share/fish/completions/at.fish
81share/fish/completions/atd.fish 320share/fish/completions/atd.fish
82share/fish/completions/atom.fish 321share/fish/completions/atom.fish
83share/fish/completions/atool.fish 322share/fish/completions/atool.fish
84share/fish/completions/atq.fish 323share/fish/completions/atq.fish
85share/fish/completions/atrm.fish 324share/fish/completions/atrm.fish
86share/fish/completions/aunpack.fish 325share/fish/completions/aunpack.fish
87share/fish/completions/aura.fish 326share/fish/completions/aura.fish
88share/fish/completions/awk.fish 327share/fish/completions/awk.fish
 328share/fish/completions/aws.fish
89share/fish/completions/badblocks.fish 329share/fish/completions/badblocks.fish
90share/fish/completions/base64.fish 330share/fish/completions/base64.fish
 331share/fish/completions/bat.fish
91share/fish/completions/bb-wrapper.fish 332share/fish/completions/bb-wrapper.fish
92share/fish/completions/bc.fish 333share/fish/completions/bc.fish
93share/fish/completions/bd.fish 334share/fish/completions/bd.fish
 335share/fish/completions/begin.fish
94share/fish/completions/bg.fish 336share/fish/completions/bg.fish
95share/fish/completions/bind.fish 337share/fish/completions/bind.fish
96share/fish/completions/bison.fish 338share/fish/completions/bison.fish
97share/fish/completions/block.fish 339share/fish/completions/block.fish
 340share/fish/completions/bosh.fish
98share/fish/completions/bower.fish 341share/fish/completions/bower.fish
99share/fish/completions/break.fish 342share/fish/completions/break.fish
100share/fish/completions/brew.fish 343share/fish/completions/brew.fish
101share/fish/completions/btdownloadcurses.py.fish 344share/fish/completions/btdownloadcurses.py.fish
102share/fish/completions/btdownloadheadless.py.fish 345share/fish/completions/btdownloadheadless.py.fish
 346share/fish/completions/btrfs.fish
103share/fish/completions/builtin.fish 347share/fish/completions/builtin.fish
104share/fish/completions/bundle.fish 348share/fish/completions/bundle.fish
105share/fish/completions/bunzip2.fish 349share/fish/completions/bunzip2.fish
106share/fish/completions/busctl.fish 350share/fish/completions/busctl.fish
107share/fish/completions/bzcat.fish 351share/fish/completions/bzcat.fish
108share/fish/completions/bzip2.fish 352share/fish/completions/bzip2.fish
109share/fish/completions/bzip2recover.fish 353share/fish/completions/bzip2recover.fish
110share/fish/completions/bzr.fish 354share/fish/completions/bzr.fish
111share/fish/completions/cabal-dev.fish 355share/fish/completions/cabal-dev.fish
112share/fish/completions/cabal.fish 356share/fish/completions/cabal.fish
113share/fish/completions/caddy.fish 357share/fish/completions/caddy.fish
114share/fish/completions/caffeinate.fish 358share/fish/completions/caffeinate.fish
 359share/fish/completions/camcontrol.fish
115share/fish/completions/cancel.fish 360share/fish/completions/cancel.fish
116share/fish/completions/canto.fish 361share/fish/completions/canto.fish
117share/fish/completions/cargo.fish 362share/fish/completions/cargo.fish
118share/fish/completions/castnow.fish 363share/fish/completions/castnow.fish
119share/fish/completions/cat.fish 364share/fish/completions/cat.fish
120share/fish/completions/cd.fish 365share/fish/completions/cd.fish
121share/fish/completions/cdh.fish 366share/fish/completions/cdh.fish
122share/fish/completions/cdrecord.fish 367share/fish/completions/cdrecord.fish
 368share/fish/completions/cf.fish
123share/fish/completions/chgrp.fish 369share/fish/completions/chgrp.fish
124share/fish/completions/chmod.fish 370share/fish/completions/chmod.fish
125share/fish/completions/chown.fish 371share/fish/completions/chown.fish
 372share/fish/completions/chronyc.fish
126share/fish/completions/chsh.fish 373share/fish/completions/chsh.fish
127share/fish/completions/clang++.fish 374share/fish/completions/clang++.fish
128share/fish/completions/clang.fish 375share/fish/completions/clang.fish
129share/fish/completions/climate.fish 376share/fish/completions/climate.fish
 377share/fish/completions/code.fish
130share/fish/completions/colordiff.fish 378share/fish/completions/colordiff.fish
131share/fish/completions/colorsvn.fish 379share/fish/completions/colorsvn.fish
132share/fish/completions/combine.fish 380share/fish/completions/combine.fish
133share/fish/completions/command.fish 381share/fish/completions/command.fish
134share/fish/completions/commandline.fish 382share/fish/completions/commandline.fish
135share/fish/completions/compare.fish 383share/fish/completions/compare.fish
136share/fish/completions/complete.fish 384share/fish/completions/complete.fish
137share/fish/completions/composer.fish 385share/fish/completions/composer.fish
138share/fish/completions/composer.phar.fish 386share/fish/completions/composer.phar.fish
139share/fish/completions/composite.fish 387share/fish/completions/composite.fish
140share/fish/completions/conda.fish 388share/fish/completions/conda.fish
141share/fish/completions/configure.fish 389share/fish/completions/configure.fish
142share/fish/completions/conjure.fish 390share/fish/completions/conjure.fish
143share/fish/completions/connmanctl.fish 391share/fish/completions/connmanctl.fish
144share/fish/completions/continue.fish 392share/fish/completions/continue.fish
145share/fish/completions/convert.fish 393share/fish/completions/convert.fish
146share/fish/completions/cower.fish 
147share/fish/completions/cowsay.fish 394share/fish/completions/cowsay.fish
148share/fish/completions/cowthink.fish 395share/fish/completions/cowthink.fish
149share/fish/completions/cp.fish 396share/fish/completions/cp.fish
 397share/fish/completions/cryptsetup.fish
 398share/fish/completions/csc.fish
 399share/fish/completions/csi.fish
150share/fish/completions/cupsaccept.fish 400share/fish/completions/cupsaccept.fish
151share/fish/completions/cupsdisable.fish 401share/fish/completions/cupsdisable.fish
152share/fish/completions/cupsenable.fish 402share/fish/completions/cupsenable.fish
153share/fish/completions/cupsreject.fish 403share/fish/completions/cupsreject.fish
154share/fish/completions/curl.fish 404share/fish/completions/curl.fish
155share/fish/completions/cut.fish 405share/fish/completions/cut.fish
156share/fish/completions/cvs.fish 406share/fish/completions/cvs.fish
 407share/fish/completions/cwebp.fish
 408share/fish/completions/cygpath.fish
157share/fish/completions/cygport.fish 409share/fish/completions/cygport.fish
 410share/fish/completions/cygstart.fish
158share/fish/completions/darcs.fish 411share/fish/completions/darcs.fish
159share/fish/completions/date.fish 412share/fish/completions/date.fish
160share/fish/completions/dconf.fish 413share/fish/completions/dconf.fish
161share/fish/completions/dd.fish 414share/fish/completions/dd.fish
162share/fish/completions/defaults.fish 415share/fish/completions/defaults.fish
163share/fish/completions/df.fish 416share/fish/completions/df.fish
164share/fish/completions/dhcpcd.fish 417share/fish/completions/dhcpcd.fish
165share/fish/completions/diff.fish 418share/fish/completions/diff.fish
166share/fish/completions/dig.fish 419share/fish/completions/dig.fish
167share/fish/completions/diskutil.fish 420share/fish/completions/diskutil.fish
168share/fish/completions/display.fish 421share/fish/completions/display.fish
169share/fish/completions/djview.fish 422share/fish/completions/djview.fish
170share/fish/completions/djview4.fish 423share/fish/completions/djview4.fish
171share/fish/completions/dlocate.fish 424share/fish/completions/dlocate.fish
172share/fish/completions/dmesg.fish 425share/fish/completions/dmesg.fish
173share/fish/completions/dnf.fish 426share/fish/completions/dnf.fish
174share/fish/completions/doas.fish 427share/fish/completions/doas.fish
175share/fish/completions/docker.fish 428share/fish/completions/docker.fish
176share/fish/completions/dpkg-reconfigure.fish 429share/fish/completions/dpkg-reconfigure.fish
177share/fish/completions/dpkg.fish 430share/fish/completions/dpkg.fish
178share/fish/completions/dropbox.fish 
179share/fish/completions/du.fish 431share/fish/completions/du.fish
180share/fish/completions/duply.fish 432share/fish/completions/duply.fish
181share/fish/completions/dvipdf.fish 433share/fish/completions/dvipdf.fish
182share/fish/completions/dvipdfm.fish 434share/fish/completions/dvipdfm.fish
183share/fish/completions/ebuild.fish 435share/fish/completions/ebuild.fish
184share/fish/completions/echo.fish 436share/fish/completions/echo.fish
185share/fish/completions/egrep.fish 437share/fish/completions/egrep.fish
186share/fish/completions/eix-sync.fish 438share/fish/completions/eix-sync.fish
187share/fish/completions/eix.fish 439share/fish/completions/eix.fish
188share/fish/completions/elatex.fish 440share/fish/completions/elatex.fish
189share/fish/completions/elixir.fish 441share/fish/completions/elixir.fish
190share/fish/completions/emacs.fish 442share/fish/completions/emacs.fish
191share/fish/completions/emaint.fish 443share/fish/completions/emaint.fish
192share/fish/completions/emerge.fish 444share/fish/completions/emerge.fish
193share/fish/completions/encfs.fish 445share/fish/completions/encfs.fish
194share/fish/completions/entr.fish 446share/fish/completions/entr.fish
195share/fish/completions/env.fish 447share/fish/completions/env.fish
196share/fish/completions/eopkg.fish 448share/fish/completions/eopkg.fish
 449share/fish/completions/epkginfo.fish
197share/fish/completions/equery.fish 450share/fish/completions/equery.fish
198share/fish/completions/eselect.fish 451share/fish/completions/eselect.fish
199share/fish/completions/etex.fish 452share/fish/completions/etex.fish
200share/fish/completions/eval.fish 453share/fish/completions/eval.fish
201share/fish/completions/evince.fish 454share/fish/completions/evince.fish
202share/fish/completions/exec.fish 455share/fish/completions/exec.fish
203share/fish/completions/exercism.fish 456share/fish/completions/exercism.fish
204share/fish/completions/exit.fish 457share/fish/completions/exit.fish
205share/fish/completions/expand.fish 458share/fish/completions/expand.fish
206share/fish/completions/ezjail-admin.fish 459share/fish/completions/ezjail-admin.fish
207share/fish/completions/fab.fish 460share/fish/completions/fab.fish
208share/fish/completions/feh.fish 461share/fish/completions/feh.fish
 462share/fish/completions/ffmpeg.fish
 463share/fish/completions/ffplay.fish
 464share/fish/completions/ffprobe.fish
209share/fish/completions/fg.fish 465share/fish/completions/fg.fish
210share/fish/completions/fgrep.fish 466share/fish/completions/fgrep.fish
211share/fish/completions/figlet.fish 467share/fish/completions/figlet.fish
212share/fish/completions/file.fish 468share/fish/completions/file.fish
213share/fish/completions/find.fish 469share/fish/completions/find.fish
214share/fish/completions/fish.fish 470share/fish/completions/fish.fish
215share/fish/completions/fish_indent.fish 471share/fish/completions/fish_indent.fish
216share/fish/completions/flac.fish 472share/fish/completions/flac.fish
217share/fish/completions/flatpak.fish 473share/fish/completions/flatpak.fish
218share/fish/completions/fluxbox-remote.fish 474share/fish/completions/fluxbox-remote.fish
 475share/fish/completions/for.fish
219share/fish/completions/fossil.fish 476share/fish/completions/fossil.fish
 477share/fish/completions/fsharpc.fish
 478share/fish/completions/fsharpi.fish
220share/fish/completions/ftp.fish 479share/fish/completions/ftp.fish
221share/fish/completions/funced.fish 480share/fish/completions/funced.fish
222share/fish/completions/funcsave.fish 481share/fish/completions/funcsave.fish
223share/fish/completions/function.fish 482share/fish/completions/function.fish
224share/fish/completions/functions.fish 483share/fish/completions/functions.fish
225share/fish/completions/fuser.fish 484share/fish/completions/fuser.fish
226share/fish/completions/fusermount.fish 485share/fish/completions/fusermount.fish
 486share/fish/completions/fzf.fish
 487share/fish/completions/g++.fish
227share/fish/completions/gcc.fish 488share/fish/completions/gcc.fish
228share/fish/completions/gdb.fish 489share/fish/completions/gdb.fish
229share/fish/completions/gem.fish 490share/fish/completions/gem.fish
230share/fish/completions/git.fish 491share/fish/completions/git.fish
231share/fish/completions/go.fish 492share/fish/completions/go.fish
232share/fish/completions/godoc.fish 493share/fish/completions/godoc.fish
233share/fish/completions/gofmt.fish 494share/fish/completions/gofmt.fish
234share/fish/completions/goimports.fish 495share/fish/completions/goimports.fish
235share/fish/completions/golint.fish 496share/fish/completions/golint.fish
236share/fish/completions/gorename.fish 497share/fish/completions/gorename.fish
237share/fish/completions/gpasswd.fish 498share/fish/completions/gpasswd.fish
238share/fish/completions/gpg.fish 499share/fish/completions/gpg.fish
 500share/fish/completions/gpg1.fish
 501share/fish/completions/gpg2.fish
239share/fish/completions/gphoto2.fish 502share/fish/completions/gphoto2.fish
240share/fish/completions/gprof.fish 503share/fish/completions/gprof.fish
241share/fish/completions/gradle.fish 504share/fish/completions/gradle.fish
242share/fish/completions/grep.fish 505share/fish/completions/grep.fish
243share/fish/completions/groupadd.fish 506share/fish/completions/groupadd.fish
244share/fish/completions/grub-file.fish 507share/fish/completions/grub-file.fish
245share/fish/completions/grub-install.fish 508share/fish/completions/grub-install.fish
 509share/fish/completions/grub-mkrescue.fish
246share/fish/completions/grunt.fish 510share/fish/completions/grunt.fish
247share/fish/completions/gsettings.fish 511share/fish/completions/gsettings.fish
248share/fish/completions/gunzip.fish 512share/fish/completions/gunzip.fish
249share/fish/completions/gv.fish 513share/fish/completions/gv.fish
250share/fish/completions/gvim.fish 514share/fish/completions/gvim.fish
251share/fish/completions/gvimdiff.fish 515share/fish/completions/gvimdiff.fish
252share/fish/completions/gzip.fish 516share/fish/completions/gzip.fish
253share/fish/completions/head.fish 517share/fish/completions/head.fish
254share/fish/completions/helm.fish 518share/fish/completions/helm.fish
255share/fish/completions/help.fish 519share/fish/completions/help.fish
256share/fish/completions/heroku.fish 520share/fish/completions/heroku.fish
257share/fish/completions/hg.fish 521share/fish/completions/hg.fish
258share/fish/completions/highlight.fish 522share/fish/completions/highlight.fish
259share/fish/completions/history.fish 523share/fish/completions/history.fish
260share/fish/completions/hjson.fish 524share/fish/completions/hjson.fish
 525share/fish/completions/hledger.fish
261share/fish/completions/htop.fish 526share/fish/completions/htop.fish
262share/fish/completions/hugo.fish 527share/fish/completions/hugo.fish
 528share/fish/completions/hwinfo.fish
263share/fish/completions/i3-msg.fish 529share/fish/completions/i3-msg.fish
264share/fish/completions/iconv.fish 530share/fish/completions/iconv.fish
265share/fish/completions/id.fish 531share/fish/completions/id.fish
266share/fish/completions/identify.fish 532share/fish/completions/identify.fish
267share/fish/completions/iex.fish 533share/fish/completions/iex.fish
 534share/fish/completions/if.fish
268share/fish/completions/ifconfig.fish 535share/fish/completions/ifconfig.fish
269share/fish/completions/ifdata.fish 536share/fish/completions/ifdata.fish
270share/fish/completions/ifdown.fish 537share/fish/completions/ifdown.fish
271share/fish/completions/ifup.fish 538share/fish/completions/ifup.fish
272share/fish/completions/import.fish 539share/fish/completions/import.fish
273share/fish/completions/invoke-rc.d.fish 540share/fish/completions/invoke-rc.d.fish
274share/fish/completions/ip.fish 541share/fish/completions/ip.fish
275share/fish/completions/ipset.fish 542share/fish/completions/ipset.fish
276share/fish/completions/iptables.fish 543share/fish/completions/iptables.fish
 544share/fish/completions/irb.fish
 545share/fish/completions/iw.fish
277share/fish/completions/j.fish 546share/fish/completions/j.fish
278share/fish/completions/jbake.fish 547share/fish/completions/jbake.fish
279share/fish/completions/jest.fish 548share/fish/completions/jest.fish
280share/fish/completions/jhipster.fish 549share/fish/completions/jhipster.fish
281share/fish/completions/jobs.fish 550share/fish/completions/jobs.fish
282share/fish/completions/journalctl.fish 551share/fish/completions/journalctl.fish
283share/fish/completions/jq.fish 552share/fish/completions/jq.fish
 553share/fish/completions/kak.fish
284share/fish/completions/kcmshell5.fish 554share/fish/completions/kcmshell5.fish
285share/fish/completions/kdeconnect-cli.fish 555share/fish/completions/kdeconnect-cli.fish
 556share/fish/completions/keepassxc-cli.fish
 557share/fish/completions/keybase.fish
286share/fish/completions/kill.fish 558share/fish/completions/kill.fish
287share/fish/completions/killall.fish 559share/fish/completions/killall.fish
288share/fish/completions/kitchen.fish 560share/fish/completions/kitchen.fish
289share/fish/completions/kitty.fish 561share/fish/completions/kitty.fish
290share/fish/completions/kldload.fish 562share/fish/completions/kldload.fish
291share/fish/completions/kldunload.fish 563share/fish/completions/kldunload.fish
292share/fish/completions/la.fish 564share/fish/completions/la.fish
293share/fish/completions/latex.fish 565share/fish/completions/latex.fish
294share/fish/completions/latexmk.fish 566share/fish/completions/latexmk.fish
295share/fish/completions/launchctl.fish 567share/fish/completions/launchctl.fish
296share/fish/completions/lein.fish 568share/fish/completions/lein.fish
297share/fish/completions/less.fish 569share/fish/completions/less.fish
298share/fish/completions/light.fish 570share/fish/completions/light.fish
299share/fish/completions/ll.fish 571share/fish/completions/ll.fish
300share/fish/completions/ln.fish 572share/fish/completions/ln.fish
301share/fish/completions/localectl.fish 573share/fish/completions/localectl.fish
302share/fish/completions/locate.fish 574share/fish/completions/locate.fish
 575share/fish/completions/loginctl.fish
303share/fish/completions/logkeys.fish 576share/fish/completions/logkeys.fish
304share/fish/completions/lp.fish 577share/fish/completions/lp.fish
305share/fish/completions/lpadmin.fish 578share/fish/completions/lpadmin.fish
306share/fish/completions/lpinfo.fish 579share/fish/completions/lpinfo.fish
307share/fish/completions/lpmove.fish 580share/fish/completions/lpmove.fish
308share/fish/completions/lpoptions.fish 581share/fish/completions/lpoptions.fish
309share/fish/completions/lppasswd.fish 582share/fish/completions/lppasswd.fish
310share/fish/completions/lpq.fish 583share/fish/completions/lpq.fish
311share/fish/completions/lpr.fish 584share/fish/completions/lpr.fish
312share/fish/completions/lprm.fish 585share/fish/completions/lprm.fish
313share/fish/completions/lpstat.fish 586share/fish/completions/lpstat.fish
314share/fish/completions/ls.fish 587share/fish/completions/ls.fish
315share/fish/completions/lsblk.fish 588share/fish/completions/lsblk.fish
316share/fish/completions/lscpu.fish 589share/fish/completions/lscpu.fish
317share/fish/completions/lsof.fish 590share/fish/completions/lsof.fish
318share/fish/completions/lsusb.fish 591share/fish/completions/lsusb.fish
319share/fish/completions/lua.fish 592share/fish/completions/lua.fish
320share/fish/completions/lualatex.fish 593share/fish/completions/lualatex.fish
321share/fish/completions/lunchy.fish 594share/fish/completions/lunchy.fish
322share/fish/completions/lxc.fish 595share/fish/completions/lxc.fish
323share/fish/completions/lxpanel.fish 596share/fish/completions/lxpanel.fish
 597share/fish/completions/lz4.fish
 598share/fish/completions/lz4c.fish
 599share/fish/completions/lz4cat.fish
324share/fish/completions/m4.fish 600share/fish/completions/m4.fish
325share/fish/completions/machinectl.fish 601share/fish/completions/machinectl.fish
326share/fish/completions/magento.fish 602share/fish/completions/magento.fish
327share/fish/completions/make.fish 603share/fish/completions/make.fish
328share/fish/completions/makedepend.fish 604share/fish/completions/makedepend.fish
329share/fish/completions/makensis.fish 605share/fish/completions/makensis.fish
330share/fish/completions/makepkg.fish 606share/fish/completions/makepkg.fish
331share/fish/completions/man.fish 607share/fish/completions/man.fish
 608share/fish/completions/mariner.fish
332share/fish/completions/math.fish 609share/fish/completions/math.fish
333share/fish/completions/mc.fish 610share/fish/completions/mc.fish
334share/fish/completions/md5sum.fish 611share/fish/completions/md5sum.fish
335share/fish/completions/mdadm.fish 612share/fish/completions/mdadm.fish
336share/fish/completions/mdbook.fish 613share/fish/completions/mdbook.fish
337share/fish/completions/mddiagnose.fish 614share/fish/completions/mddiagnose.fish
338share/fish/completions/mdfind.fish 615share/fish/completions/mdfind.fish
339share/fish/completions/mdimport.fish 616share/fish/completions/mdimport.fish
340share/fish/completions/mdls.fish 617share/fish/completions/mdls.fish
341share/fish/completions/mdutil.fish 618share/fish/completions/mdutil.fish
342share/fish/completions/meson.fish 619share/fish/completions/meson.fish
343share/fish/completions/minikube.fish 620share/fish/completions/minikube.fish
344share/fish/completions/mix.fish 621share/fish/completions/mix.fish
@@ -356,30 +633,31 @@ share/fish/completions/modinfo.fish @@ -356,30 +633,31 @@ share/fish/completions/modinfo.fish
356share/fish/completions/modprobe.fish 633share/fish/completions/modprobe.fish
357share/fish/completions/mogrify.fish 634share/fish/completions/mogrify.fish
358share/fish/completions/montage.fish 635share/fish/completions/montage.fish
359share/fish/completions/mosh.fish 636share/fish/completions/mosh.fish
360share/fish/completions/mount.fish 637share/fish/completions/mount.fish
361share/fish/completions/mplayer.fish 638share/fish/completions/mplayer.fish
362share/fish/completions/msgfmt.fish 639share/fish/completions/msgfmt.fish
363share/fish/completions/mupdf.fish 640share/fish/completions/mupdf.fish
364share/fish/completions/mutt.fish 641share/fish/completions/mutt.fish
365share/fish/completions/mv.fish 642share/fish/completions/mv.fish
366share/fish/completions/mvn.fish 643share/fish/completions/mvn.fish
367share/fish/completions/namei.fish 644share/fish/completions/namei.fish
368share/fish/completions/native2ascii.fish 645share/fish/completions/native2ascii.fish
 646share/fish/completions/nc.fish
369share/fish/completions/ncdu.fish 647share/fish/completions/ncdu.fish
370share/fish/completions/netcat.fish 
371share/fish/completions/netctl-auto.fish 648share/fish/completions/netctl-auto.fish
372share/fish/completions/netctl.fish 649share/fish/completions/netctl.fish
 650share/fish/completions/nethack.fish
373share/fish/completions/networkctl.fish 651share/fish/completions/networkctl.fish
374share/fish/completions/nextd.fish 652share/fish/completions/nextd.fish
375share/fish/completions/ngrok.fish 653share/fish/completions/ngrok.fish
376share/fish/completions/nice.fish 654share/fish/completions/nice.fish
377share/fish/completions/ninja.fish 655share/fish/completions/ninja.fish
378share/fish/completions/nl.fish 656share/fish/completions/nl.fish
379share/fish/completions/nm.fish 657share/fish/completions/nm.fish
380share/fish/completions/nmcli.fish 658share/fish/completions/nmcli.fish
381share/fish/completions/node.fish 659share/fish/completions/node.fish
382share/fish/completions/not.fish 660share/fish/completions/not.fish
383share/fish/completions/npm.fish 661share/fish/completions/npm.fish
384share/fish/completions/nvim.fish 662share/fish/completions/nvim.fish
385share/fish/completions/nvram.fish 663share/fish/completions/nvram.fish
@@ -390,134 +668,144 @@ share/fish/completions/omega.fish @@ -390,134 +668,144 @@ share/fish/completions/omega.fish
390share/fish/completions/opam.fish 668share/fish/completions/opam.fish
391share/fish/completions/open.fish 669share/fish/completions/open.fish
392share/fish/completions/openocd.fish 670share/fish/completions/openocd.fish
393share/fish/completions/opkg.fish 671share/fish/completions/opkg.fish
394share/fish/completions/optipng.fish 672share/fish/completions/optipng.fish
395share/fish/completions/or.fish 673share/fish/completions/or.fish
396share/fish/completions/p4.fish 674share/fish/completions/p4.fish
397share/fish/completions/pacaur.fish 675share/fish/completions/pacaur.fish
398share/fish/completions/pacman-color.fish 676share/fish/completions/pacman-color.fish
399share/fish/completions/pacman-key.fish 677share/fish/completions/pacman-key.fish
400share/fish/completions/pacman.fish 678share/fish/completions/pacman.fish
401share/fish/completions/pacmatic.fish 679share/fish/completions/pacmatic.fish
402share/fish/completions/pacmd.fish 680share/fish/completions/pacmd.fish
403share/fish/completions/pacsrv.fish 
404share/fish/completions/pactl.fish 681share/fish/completions/pactl.fish
405share/fish/completions/pactree.fish 682share/fish/completions/pactree.fish
406share/fish/completions/pandoc.fish 683share/fish/completions/pandoc.fish
407share/fish/completions/passwd.fish 684share/fish/completions/passwd.fish
408share/fish/completions/patch.fish 685share/fish/completions/patch.fish
 686share/fish/completions/patool.fish
409share/fish/completions/pbget.fish 687share/fish/completions/pbget.fish
410share/fish/completions/pdfelatex.fish 688share/fish/completions/pdfelatex.fish
411share/fish/completions/pdfetex.fish 689share/fish/completions/pdfetex.fish
412share/fish/completions/pdflatex.fish 690share/fish/completions/pdflatex.fish
413share/fish/completions/pdftex.fish 691share/fish/completions/pdftex.fish
414share/fish/completions/pdftotext.fish 692share/fish/completions/pdftotext.fish
415share/fish/completions/perl.fish 693share/fish/completions/perl.fish
416share/fish/completions/pfctl.fish 694share/fish/completions/pfctl.fish
417share/fish/completions/pftp.fish 695share/fish/completions/pftp.fish
418share/fish/completions/pgrep.fish 696share/fish/completions/pgrep.fish
 697share/fish/completions/phpunit.fish
419share/fish/completions/pine.fish 698share/fish/completions/pine.fish
420share/fish/completions/ping.fish 699share/fish/completions/ping.fish
421share/fish/completions/pinky.fish 700share/fish/completions/pinky.fish
422share/fish/completions/pip.fish 701share/fish/completions/pip.fish
423share/fish/completions/pip2.fish 702share/fish/completions/pip2.fish
424share/fish/completions/pip3.fish 703share/fish/completions/pip3.fish
425share/fish/completions/pipenv.fish 704share/fish/completions/pipenv.fish
426share/fish/completions/pkg-config.fish 705share/fish/completions/pkg-config.fish
427share/fish/completions/pkg.fish 706share/fish/completions/pkg.fish
428share/fish/completions/pkg_add.fish 707share/fish/completions/pkg_add.fish
429share/fish/completions/pkg_delete.fish 708share/fish/completions/pkg_delete.fish
430share/fish/completions/pkg_info.fish 709share/fish/completions/pkg_info.fish
431share/fish/completions/pkgadd.fish 710share/fish/completions/pkgadd.fish
432share/fish/completions/pkgfile.fish 711share/fish/completions/pkgfile.fish
433share/fish/completions/pkginfo.fish 712share/fish/completions/pkginfo.fish
434share/fish/completions/pkgmk.fish 713share/fish/completions/pkgmk.fish
435share/fish/completions/pkgrm.fish 714share/fish/completions/pkgrm.fish
436share/fish/completions/pkill.fish 715share/fish/completions/pkill.fish
 716share/fish/completions/plutil.fish
437share/fish/completions/poff.fish 717share/fish/completions/poff.fish
438share/fish/completions/pon.fish 718share/fish/completions/pon.fish
439share/fish/completions/port.fish 719share/fish/completions/port.fish
440share/fish/completions/portmaster.fish 720share/fish/completions/portmaster.fish
441share/fish/completions/ports.fish 721share/fish/completions/ports.fish
442share/fish/completions/poweroff.fish 722share/fish/completions/poweroff.fish
443share/fish/completions/powerpill.fish 723share/fish/completions/powerpill.fish
444share/fish/completions/prevd.fish 724share/fish/completions/prevd.fish
445share/fish/completions/prt-get.fish 725share/fish/completions/prt-get.fish
446share/fish/completions/ps.fish 726share/fish/completions/ps.fish
447share/fish/completions/ps2pdf.fish 727share/fish/completions/ps2pdf.fish
448share/fish/completions/psql.fish 728share/fish/completions/psql.fish
449share/fish/completions/pstack.fish 729share/fish/completions/pstack.fish
450share/fish/completions/psub.fish 730share/fish/completions/psub.fish
451share/fish/completions/pushd.fish 731share/fish/completions/pushd.fish
452share/fish/completions/pv.fish 732share/fish/completions/pv.fish
453share/fish/completions/pydf.fish 733share/fish/completions/pydf.fish
454share/fish/completions/pygmentize.fish 734share/fish/completions/pygmentize.fish
455share/fish/completions/python.fish 735share/fish/completions/python.fish
456share/fish/completions/python2.fish 736share/fish/completions/python2.fish
457share/fish/completions/python3.fish 737share/fish/completions/python3.fish
 738share/fish/completions/pzstd.fish
 739share/fish/completions/qubes-gpg-client.fish
458share/fish/completions/quilt.fish 740share/fish/completions/quilt.fish
459share/fish/completions/random.fish 741share/fish/completions/random.fish
460share/fish/completions/ranger.fish 742share/fish/completions/ranger.fish
461share/fish/completions/rbenv.fish 743share/fish/completions/rbenv.fish
462share/fish/completions/rc-service.fish 744share/fish/completions/rc-service.fish
463share/fish/completions/rc-update.fish 745share/fish/completions/rc-update.fish
464share/fish/completions/rc.d.fish 
465share/fish/completions/rcctl.fish 746share/fish/completions/rcctl.fish
466share/fish/completions/read.fish 747share/fish/completions/read.fish
467share/fish/completions/readlink.fish 748share/fish/completions/readlink.fish
468share/fish/completions/realpath.fish 749share/fish/completions/realpath.fish
469share/fish/completions/reject.fish 750share/fish/completions/reject.fish
470share/fish/completions/rejmerge.fish 751share/fish/completions/rejmerge.fish
471share/fish/completions/renice.fish 752share/fish/completions/renice.fish
 753share/fish/completions/resolvectl.fish
472share/fish/completions/return.fish 754share/fish/completions/return.fish
473share/fish/completions/rfkill.fish 755share/fish/completions/rfkill.fish
 756share/fish/completions/rg.fish
474share/fish/completions/rgrep.fish 757share/fish/completions/rgrep.fish
475share/fish/completions/rm.fish 758share/fish/completions/rm.fish
476share/fish/completions/rmdir.fish 759share/fish/completions/rmdir.fish
477share/fish/completions/rmmod.fish 760share/fish/completions/rmmod.fish
478share/fish/completions/root.fish 761share/fish/completions/root.fish
479share/fish/completions/rpm.fish 762share/fish/completions/rpm.fish
480share/fish/completions/rsync.fish 763share/fish/completions/rsync.fish
481share/fish/completions/ruby-build.fish 764share/fish/completions/ruby-build.fish
482share/fish/completions/ruby.fish 765share/fish/completions/ruby.fish
483share/fish/completions/rustc.fish 766share/fish/completions/rustc.fish
 767share/fish/completions/rustup.fish
484share/fish/completions/s3cmd.fish 768share/fish/completions/s3cmd.fish
485share/fish/completions/sass-convert.fish 769share/fish/completions/sass-convert.fish
486share/fish/completions/sass.fish 770share/fish/completions/sass.fish
487share/fish/completions/sbt.fish 771share/fish/completions/sbt.fish
488share/fish/completions/scanimage.fish 772share/fish/completions/scanimage.fish
489share/fish/completions/scons.fish 773share/fish/completions/scons.fish
490share/fish/completions/scp.fish 774share/fish/completions/scp.fish
491share/fish/completions/screen.fish 775share/fish/completions/screen.fish
492share/fish/completions/scrot.fish 776share/fish/completions/scrot.fish
493share/fish/completions/scss.fish 777share/fish/completions/scss.fish
494share/fish/completions/sed.fish 778share/fish/completions/sed.fish
495share/fish/completions/seq.fish 779share/fish/completions/seq.fish
496share/fish/completions/serve.fish 780share/fish/completions/serve.fish
497share/fish/completions/service.fish 781share/fish/completions/service.fish
498share/fish/completions/set.fish 782share/fish/completions/set.fish
499share/fish/completions/set_color.fish 783share/fish/completions/set_color.fish
500share/fish/completions/setfacl.fish 784share/fish/completions/setfacl.fish
501share/fish/completions/setsid.fish 785share/fish/completions/setsid.fish
502share/fish/completions/setxkbmap.fish 786share/fish/completions/setxkbmap.fish
 787share/fish/completions/sfdx.fish
503share/fish/completions/sha1sum.fish 788share/fish/completions/sha1sum.fish
504share/fish/completions/sha224sum.fish 789share/fish/completions/sha224sum.fish
505share/fish/completions/sha256sum.fish 790share/fish/completions/sha256sum.fish
506share/fish/completions/sha384sum.fish 791share/fish/completions/sha384sum.fish
507share/fish/completions/sha512sum.fish 792share/fish/completions/sha512sum.fish
508share/fish/completions/signify.fish 793share/fish/completions/signify.fish
509share/fish/completions/snap.fish 794share/fish/completions/snap.fish
510share/fish/completions/sort.fish 795share/fish/completions/sort.fish
 796share/fish/completions/speedtest-cli.fish
 797share/fish/completions/speedtest.fish
 798share/fish/completions/src.fish
511share/fish/completions/ssh.fish 799share/fish/completions/ssh.fish
512share/fish/completions/sshfs.fish 800share/fish/completions/sshfs.fish
513share/fish/completions/stack.fish 801share/fish/completions/stack.fish
514share/fish/completions/stat.fish 802share/fish/completions/stat.fish
515share/fish/completions/status.fish 803share/fish/completions/status.fish
516share/fish/completions/stream.fish 804share/fish/completions/stream.fish
517share/fish/completions/string.fish 805share/fish/completions/string.fish
518share/fish/completions/su.fish 806share/fish/completions/su.fish
519share/fish/completions/subl.fish 807share/fish/completions/subl.fish
520share/fish/completions/sudo.fish 808share/fish/completions/sudo.fish
521share/fish/completions/svn.fish 809share/fish/completions/svn.fish
522share/fish/completions/sylpheed.fish 810share/fish/completions/sylpheed.fish
523share/fish/completions/sysbench.fish 811share/fish/completions/sysbench.fish
@@ -529,66 +817,72 @@ share/fish/completions/tail.fish @@ -529,66 +817,72 @@ share/fish/completions/tail.fish
529share/fish/completions/tar.fish 817share/fish/completions/tar.fish
530share/fish/completions/tee.fish 818share/fish/completions/tee.fish
531share/fish/completions/telnet.fish 819share/fish/completions/telnet.fish
532share/fish/completions/termite.fish 820share/fish/completions/termite.fish
533share/fish/completions/terraform.fish 821share/fish/completions/terraform.fish
534share/fish/completions/test.fish 822share/fish/completions/test.fish
535share/fish/completions/tex.fish 823share/fish/completions/tex.fish
536share/fish/completions/time.fish 824share/fish/completions/time.fish
537share/fish/completions/timedatectl.fish 825share/fish/completions/timedatectl.fish
538share/fish/completions/timeout.fish 826share/fish/completions/timeout.fish
539share/fish/completions/tmutil.fish 827share/fish/completions/tmutil.fish
540share/fish/completions/tmux.fish 828share/fish/completions/tmux.fish
541share/fish/completions/tmuxinator.fish 829share/fish/completions/tmuxinator.fish
 830share/fish/completions/tokei.fish
542share/fish/completions/top.fish 831share/fish/completions/top.fish
543share/fish/completions/totem.fish 832share/fish/completions/totem.fish
544share/fish/completions/touch.fish 833share/fish/completions/touch.fish
545share/fish/completions/tr.fish 834share/fish/completions/tr.fish
546share/fish/completions/transmission-remote.fish 835share/fish/completions/transmission-remote.fish
547share/fish/completions/trap.fish 836share/fish/completions/trap.fish
548share/fish/completions/travis.fish 837share/fish/completions/travis.fish
549share/fish/completions/tree.fish 838share/fish/completions/tree.fish
 839share/fish/completions/tsc.fish
550share/fish/completions/ttx.fish 840share/fish/completions/ttx.fish
551share/fish/completions/type.fish 841share/fish/completions/type.fish
552share/fish/completions/udisksctl.fish 842share/fish/completions/udisksctl.fish
553share/fish/completions/ulimit.fish 843share/fish/completions/ulimit.fish
554share/fish/completions/umask.fish 844share/fish/completions/umask.fish
555share/fish/completions/umount.fish 845share/fish/completions/umount.fish
556share/fish/completions/uname.fish 846share/fish/completions/uname.fish
557share/fish/completions/unexpand.fish 847share/fish/completions/unexpand.fish
558share/fish/completions/uniq.fish 848share/fish/completions/uniq.fish
 849share/fish/completions/unlz4.fish
559share/fish/completions/unrar.fish 850share/fish/completions/unrar.fish
560share/fish/completions/unzip.fish 851share/fish/completions/unzip.fish
 852share/fish/completions/unzstd.fish
561share/fish/completions/update-eix-remote.fish 853share/fish/completions/update-eix-remote.fish
562share/fish/completions/update-eix.fish 854share/fish/completions/update-eix.fish
563share/fish/completions/useradd.fish 855share/fish/completions/useradd.fish
564share/fish/completions/usermod.fish 856share/fish/completions/usermod.fish
565share/fish/completions/vagrant.fish 857share/fish/completions/vagrant.fish
566share/fish/completions/valgrind.fish 858share/fish/completions/valgrind.fish
567share/fish/completions/vared.fish 859share/fish/completions/vared.fish
 860share/fish/completions/vbc.fish
568share/fish/completions/vi.fish 861share/fish/completions/vi.fish
569share/fish/completions/vim-addons.fish 862share/fish/completions/vim-addons.fish
570share/fish/completions/vim.fish 863share/fish/completions/vim.fish
571share/fish/completions/vimdiff.fish 864share/fish/completions/vimdiff.fish
572share/fish/completions/virsh.fish 865share/fish/completions/virsh.fish
573share/fish/completions/vmctl.fish 866share/fish/completions/vmctl.fish
574share/fish/completions/w.fish 867share/fish/completions/w.fish
575share/fish/completions/wajig.fish 868share/fish/completions/wajig.fish
576share/fish/completions/watch.fish 869share/fish/completions/watch.fish
577share/fish/completions/wc.fish 870share/fish/completions/wc.fish
578share/fish/completions/wesnoth.fish 871share/fish/completions/wesnoth.fish
579share/fish/completions/wget.fish 872share/fish/completions/wget.fish
580share/fish/completions/whatis.fish 873share/fish/completions/whatis.fish
581share/fish/completions/which.fish 874share/fish/completions/which.fish
 875share/fish/completions/while.fish
582share/fish/completions/who.fish 876share/fish/completions/who.fish
583share/fish/completions/wicd-cli.fish 877share/fish/completions/wicd-cli.fish
584share/fish/completions/wicd-client.fish 878share/fish/completions/wicd-client.fish
585share/fish/completions/wicd-gtk.fish 879share/fish/completions/wicd-gtk.fish
586share/fish/completions/wpa_cli.fish 880share/fish/completions/wpa_cli.fish
587share/fish/completions/wvdial.fish 881share/fish/completions/wvdial.fish
588share/fish/completions/xargs.fish 882share/fish/completions/xargs.fish
589share/fish/completions/xclip.fish 883share/fish/completions/xclip.fish
590share/fish/completions/xdg-mime.fish 884share/fish/completions/xdg-mime.fish
591share/fish/completions/xdvi.fish 885share/fish/completions/xdvi.fish
592share/fish/completions/xelatex.fish 886share/fish/completions/xelatex.fish
593share/fish/completions/xgettext.fish 887share/fish/completions/xgettext.fish
594share/fish/completions/xinput.fish 888share/fish/completions/xinput.fish
@@ -598,329 +892,332 @@ share/fish/completions/xprop.fish @@ -598,329 +892,332 @@ share/fish/completions/xprop.fish
598share/fish/completions/xrandr.fish 892share/fish/completions/xrandr.fish
599share/fish/completions/xrdb.fish 893share/fish/completions/xrdb.fish
600share/fish/completions/xsel.fish 894share/fish/completions/xsel.fish
601share/fish/completions/xsv.fish 895share/fish/completions/xsv.fish
602share/fish/completions/xterm.fish 896share/fish/completions/xterm.fish
603share/fish/completions/xz.fish 897share/fish/completions/xz.fish
604share/fish/completions/yaourt.fish 898share/fish/completions/yaourt.fish
605share/fish/completions/yarn.fish 899share/fish/completions/yarn.fish
606share/fish/completions/yast2.fish 900share/fish/completions/yast2.fish
607share/fish/completions/yum.fish 901share/fish/completions/yum.fish
608share/fish/completions/zcat.fish 902share/fish/completions/zcat.fish
609share/fish/completions/zfs.fish 903share/fish/completions/zfs.fish
610share/fish/completions/zip.fish 904share/fish/completions/zip.fish
 905share/fish/completions/zpaq.fish
611share/fish/completions/zpool.fish 906share/fish/completions/zpool.fish
 907share/fish/completions/zstd.fish
 908share/fish/completions/zstdcat.fish
 909share/fish/completions/zstdgrep.fish
 910share/fish/completions/zstdless.fish
 911share/fish/completions/zstdmt.fish
612share/fish/completions/zypper.fish 912share/fish/completions/zypper.fish
613share/fish/config.fish 913share/fish/config.fish
614share/fish/functions/N_.fish 914share/fish/functions/N_.fish
615share/fish/functions/_.fish 915share/fish/functions/_.fish
616share/fish/functions/__fish_abbr_old.fish 916share/fish/functions/__fish_abbr_old.fish
 917share/fish/functions/__fish_any_arg_in.fish
 918share/fish/functions/__fish_anypython.fish
617share/fish/functions/__fish_append.fish 919share/fish/functions/__fish_append.fish
618share/fish/functions/__fish_bind_test1.fish 
619share/fish/functions/__fish_bind_test2.fish 
620share/fish/functions/__fish_can_complete_switches.fish 
621share/fish/functions/__fish_cancel_commandline.fish 920share/fish/functions/__fish_cancel_commandline.fish
622share/fish/functions/__fish_clang_complete.fish 921share/fish/functions/__fish_clang_complete.fish
623share/fish/functions/__fish_commandline_is_singlequoted.fish 922share/fish/functions/__fish_commandline_is_singlequoted.fish
624share/fish/functions/__fish_commandline_test.fish 
625share/fish/functions/__fish_complete_abook_formats.fish 
626share/fish/functions/__fish_complete_ant_targets.fish 
627share/fish/functions/__fish_complete_atool_archive_contents.fish 923share/fish/functions/__fish_complete_atool_archive_contents.fish
628share/fish/functions/__fish_complete_bittorrent.fish 924share/fish/functions/__fish_complete_bittorrent.fish
629share/fish/functions/__fish_complete_blockdevice.fish 925share/fish/functions/__fish_complete_blockdevice.fish
630share/fish/functions/__fish_complete_cd.fish 926share/fish/functions/__fish_complete_cd.fish
631share/fish/functions/__fish_complete_command.fish 927share/fish/functions/__fish_complete_command.fish
632share/fish/functions/__fish_complete_convert_options.fish 928share/fish/functions/__fish_complete_convert_options.fish
633share/fish/functions/__fish_complete_directories.fish 929share/fish/functions/__fish_complete_directories.fish
634share/fish/functions/__fish_complete_file_url.fish 930share/fish/functions/__fish_complete_external_command.fish
635share/fish/functions/__fish_complete_ftp.fish 931share/fish/functions/__fish_complete_ftp.fish
 932share/fish/functions/__fish_complete_gpg.fish
 933share/fish/functions/__fish_complete_gpg_key_id.fish
 934share/fish/functions/__fish_complete_gpg_user_id.fish
636share/fish/functions/__fish_complete_groups.fish 935share/fish/functions/__fish_complete_groups.fish
637share/fish/functions/__fish_complete_job_pids.fish 936share/fish/functions/__fish_complete_job_pids.fish
638share/fish/functions/__fish_complete_list.fish 937share/fish/functions/__fish_complete_list.fish
639share/fish/functions/__fish_complete_lpr.fish 938share/fish/functions/__fish_complete_lpr.fish
640share/fish/functions/__fish_complete_lpr_option.fish 939share/fish/functions/__fish_complete_lpr_option.fish
641share/fish/functions/__fish_complete_lsusb.fish 
642share/fish/functions/__fish_complete_man.fish 940share/fish/functions/__fish_complete_man.fish
643share/fish/functions/__fish_complete_mount_opts.fish 941share/fish/functions/__fish_complete_mount_opts.fish
644share/fish/functions/__fish_complete_path.fish 942share/fish/functions/__fish_complete_path.fish
645share/fish/functions/__fish_complete_pgrep.fish 943share/fish/functions/__fish_complete_pgrep.fish
646share/fish/functions/__fish_complete_pids.fish 944share/fish/functions/__fish_complete_pids.fish
647share/fish/functions/__fish_complete_ppp_peer.fish 945share/fish/functions/__fish_complete_ppp_peer.fish
648share/fish/functions/__fish_complete_proc.fish 946share/fish/functions/__fish_complete_proc.fish
649share/fish/functions/__fish_complete_setxkbmap.fish 
650share/fish/functions/__fish_complete_ssh.fish 947share/fish/functions/__fish_complete_ssh.fish
651share/fish/functions/__fish_complete_subcommand.fish 948share/fish/functions/__fish_complete_subcommand.fish
652share/fish/functions/__fish_complete_subcommand_root.fish 
653share/fish/functions/__fish_complete_suffix.fish 949share/fish/functions/__fish_complete_suffix.fish
654share/fish/functions/__fish_complete_svn_diff.fish 
655share/fish/functions/__fish_complete_tar.fish 
656share/fish/functions/__fish_complete_unrar.fish 
657share/fish/functions/__fish_complete_user_at_hosts.fish 950share/fish/functions/__fish_complete_user_at_hosts.fish
658share/fish/functions/__fish_complete_users.fish 951share/fish/functions/__fish_complete_users.fish
659share/fish/functions/__fish_complete_wvdial_peers.fish 
660share/fish/functions/__fish_complete_zfs_mountpoint_properties.fish 952share/fish/functions/__fish_complete_zfs_mountpoint_properties.fish
661share/fish/functions/__fish_complete_zfs_pools.fish 953share/fish/functions/__fish_complete_zfs_pools.fish
662share/fish/functions/__fish_complete_zfs_ro_properties.fish 954share/fish/functions/__fish_complete_zfs_ro_properties.fish
663share/fish/functions/__fish_complete_zfs_rw_properties.fish 955share/fish/functions/__fish_complete_zfs_rw_properties.fish
664share/fish/functions/__fish_complete_zfs_write_once_properties.fish 956share/fish/functions/__fish_complete_zfs_write_once_properties.fish
665share/fish/functions/__fish_config_interactive.fish 957share/fish/functions/__fish_config_interactive.fish
666share/fish/functions/__fish_contains_opt.fish 958share/fish/functions/__fish_contains_opt.fish
667share/fish/functions/__fish_crux_packages.fish 959share/fish/functions/__fish_crux_packages.fish
668share/fish/functions/__fish_cursor_1337.fish 960share/fish/functions/__fish_cursor_1337.fish
669share/fish/functions/__fish_cursor_konsole.fish 961share/fish/functions/__fish_cursor_konsole.fish
670share/fish/functions/__fish_cursor_xterm.fish 962share/fish/functions/__fish_cursor_xterm.fish
671share/fish/functions/__fish_describe_command.fish 963share/fish/functions/__fish_describe_command.fish
672share/fish/functions/__fish_filter_ant_targets.fish 
673share/fish/functions/__fish_first_token.fish 964share/fish/functions/__fish_first_token.fish
674share/fish/functions/__fish_git_prompt.fish 965share/fish/functions/__fish_git_prompt.fish
675share/fish/functions/__fish_gnu_complete.fish 966share/fish/functions/__fish_gnu_complete.fish
676share/fish/functions/__fish_hg_prompt.fish 967share/fish/functions/__fish_hg_prompt.fish
677share/fish/functions/__fish_is_first_arg.fish 968share/fish/functions/__fish_is_first_arg.fish
678share/fish/functions/__fish_is_first_token.fish 969share/fish/functions/__fish_is_first_token.fish
679share/fish/functions/__fish_is_git_repository.fish 970share/fish/functions/__fish_is_git_repository.fish
680share/fish/functions/__fish_is_switch.fish 971share/fish/functions/__fish_is_switch.fish
681share/fish/functions/__fish_is_token_n.fish 972share/fish/functions/__fish_is_token_n.fish
682share/fish/functions/__fish_is_zfs_feature_enabled.fish 973share/fish/functions/__fish_is_zfs_feature_enabled.fish
683share/fish/functions/__fish_list_current_token.fish 974share/fish/functions/__fish_list_current_token.fish
684share/fish/functions/__fish_make_completion_signals.fish 975share/fish/functions/__fish_make_completion_signals.fish
685share/fish/functions/__fish_man_page.fish 976share/fish/functions/__fish_man_page.fish
686share/fish/functions/__fish_move_last.fish 977share/fish/functions/__fish_move_last.fish
687share/fish/functions/__fish_no_arguments.fish 978share/fish/functions/__fish_no_arguments.fish
688share/fish/functions/__fish_not_contain_opt.fish 979share/fish/functions/__fish_not_contain_opt.fish
689share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish 980share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish
690share/fish/functions/__fish_paginate.fish 981share/fish/functions/__fish_paginate.fish
691share/fish/functions/__fish_parent_directories.fish 982share/fish/functions/__fish_parent_directories.fish
692share/fish/functions/__fish_parse_configure.fish 983share/fish/functions/__fish_pipestatus_with_signal.fish
693share/fish/functions/__fish_portage_print_available_pkgs.fish 984share/fish/functions/__fish_portage_print_available_pkgs.fish
694share/fish/functions/__fish_portage_print_installed_pkgs.fish 985share/fish/functions/__fish_portage_print_installed_pkgs.fish
695share/fish/functions/__fish_portage_print_repository_names.fish 
696share/fish/functions/__fish_portage_print_repository_paths.fish 986share/fish/functions/__fish_portage_print_repository_paths.fish
697share/fish/functions/__fish_ports_dirs.fish 987share/fish/functions/__fish_prepend_sudo.fish
698share/fish/functions/__fish_prev_arg_in.fish 988share/fish/functions/__fish_prev_arg_in.fish
699share/fish/functions/__fish_print_VBox_vms.fish 989share/fish/functions/__fish_print_VBox_vms.fish
700share/fish/functions/__fish_print_abook_emails.fish 
701share/fish/functions/__fish_print_addresses.fish 990share/fish/functions/__fish_print_addresses.fish
702share/fish/functions/__fish_print_arch_daemons.fish 
703share/fish/functions/__fish_print_cmd_args.fish 991share/fish/functions/__fish_print_cmd_args.fish
704share/fish/functions/__fish_print_cmd_args_without_options.fish 992share/fish/functions/__fish_print_cmd_args_without_options.fish
705share/fish/functions/__fish_print_commands.fish 993share/fish/functions/__fish_print_commands.fish
706share/fish/functions/__fish_print_debian_apache_confs.fish 994share/fish/functions/__fish_print_debian_apache_confs.fish
707share/fish/functions/__fish_print_debian_apache_mods.fish 995share/fish/functions/__fish_print_debian_apache_mods.fish
708share/fish/functions/__fish_print_debian_apache_sites.fish 996share/fish/functions/__fish_print_debian_apache_sites.fish
709share/fish/functions/__fish_print_debian_services.fish 
710share/fish/functions/__fish_print_encodings.fish 997share/fish/functions/__fish_print_encodings.fish
711share/fish/functions/__fish_print_filesystems.fish 998share/fish/functions/__fish_print_filesystems.fish
712share/fish/functions/__fish_print_function_prototypes.fish 999share/fish/functions/__fish_print_gpg_algo.fish
713share/fish/functions/__fish_print_groups.fish 1000share/fish/functions/__fish_print_groups.fish
714share/fish/functions/__fish_print_help.fish 1001share/fish/functions/__fish_print_help.fish
715share/fish/functions/__fish_print_hostnames.fish 1002share/fish/functions/__fish_print_hostnames.fish
716share/fish/functions/__fish_print_interfaces.fish 1003share/fish/functions/__fish_print_interfaces.fish
717share/fish/functions/__fish_print_lpr_options.fish 1004share/fish/functions/__fish_print_lpr_options.fish
718share/fish/functions/__fish_print_lpr_printers.fish 1005share/fish/functions/__fish_print_lpr_printers.fish
719share/fish/functions/__fish_print_lsblk_columns.fish 
720share/fish/functions/__fish_print_make_targets.fish 
721share/fish/functions/__fish_print_modules.fish 1006share/fish/functions/__fish_print_modules.fish
722share/fish/functions/__fish_print_mounted.fish 1007share/fish/functions/__fish_print_mounted.fish
723share/fish/functions/__fish_print_ninja_targets.fish 
724share/fish/functions/__fish_print_ninja_tools.fish 
725share/fish/functions/__fish_print_packages.fish 1008share/fish/functions/__fish_print_packages.fish
726share/fish/functions/__fish_print_pacman_repos.fish 1009share/fish/functions/__fish_print_pacman_repos.fish
 1010share/fish/functions/__fish_print_pipestatus.fish
727share/fish/functions/__fish_print_service_names.fish 1011share/fish/functions/__fish_print_service_names.fish
728share/fish/functions/__fish_print_svn_rev.fish 1012share/fish/functions/__fish_print_svn_rev.fish
729share/fish/functions/__fish_print_users.fish 1013share/fish/functions/__fish_print_users.fish
730share/fish/functions/__fish_print_xdg_applications_directories.fish 1014share/fish/functions/__fish_print_xdg_applications_directories.fish
731share/fish/functions/__fish_print_xdg_desktop_file_ids.fish 
732share/fish/functions/__fish_print_xdg_mimetypes.fish 1015share/fish/functions/__fish_print_xdg_mimetypes.fish
733share/fish/functions/__fish_print_xrandr_modes.fish 
734share/fish/functions/__fish_print_xrandr_outputs.fish 
735share/fish/functions/__fish_print_xwindows.fish 1016share/fish/functions/__fish_print_xwindows.fish
736share/fish/functions/__fish_print_zfs_bookmarks.fish 
737share/fish/functions/__fish_print_zfs_filesystems.fish 
738share/fish/functions/__fish_print_zfs_snapshots.fish 1017share/fish/functions/__fish_print_zfs_snapshots.fish
739share/fish/functions/__fish_print_zfs_volumes.fish 
740share/fish/functions/__fish_prt_no_subcommand.fish 
741share/fish/functions/__fish_prt_packages.fish 
742share/fish/functions/__fish_prt_ports.fish 
743share/fish/functions/__fish_prt_use_package.fish 
744share/fish/functions/__fish_prt_use_port.fish 
745share/fish/functions/__fish_pwd.fish 1018share/fish/functions/__fish_pwd.fish
746share/fish/functions/__fish_seen_argument.fish 1019share/fish/functions/__fish_seen_argument.fish
747share/fish/functions/__fish_seen_subcommand_from.fish 1020share/fish/functions/__fish_seen_subcommand_from.fish
748share/fish/functions/__fish_set_locale.fish 1021share/fish/functions/__fish_set_locale.fish
749share/fish/functions/__fish_sgrep.fish 
750share/fish/functions/__fish_shared_key_bindings.fish 1022share/fish/functions/__fish_shared_key_bindings.fish
751share/fish/functions/__fish_should_complete_switches.fish 1023share/fish/functions/__fish_should_complete_switches.fish
 1024share/fish/functions/__fish_status_to_signal.fish
752share/fish/functions/__fish_svn_prompt.fish 1025share/fish/functions/__fish_svn_prompt.fish
753share/fish/functions/__fish_systemctl_services.fish 1026share/fish/functions/__fish_systemctl_services.fish
754share/fish/functions/__fish_systemd_machine_images.fish 1027share/fish/functions/__fish_systemd_machine_images.fish
755share/fish/functions/__fish_systemd_machines.fish 1028share/fish/functions/__fish_systemd_machines.fish
756share/fish/functions/__fish_test_arg.fish 
757share/fish/functions/__fish_toggle_comment_commandline.fish 1029share/fish/functions/__fish_toggle_comment_commandline.fish
758share/fish/functions/__fish_use_subcommand.fish 1030share/fish/functions/__fish_use_subcommand.fish
759share/fish/functions/__fish_vcs_prompt.fish 1031share/fish/functions/__fish_vcs_prompt.fish
760share/fish/functions/__fish_whatis.fish 1032share/fish/functions/__fish_whatis.fish
 1033share/fish/functions/__fish_whatis_current_token.fish
761share/fish/functions/__terlar_git_prompt.fish 1034share/fish/functions/__terlar_git_prompt.fish
762share/fish/functions/_fish_systemctl.fish 1035share/fish/functions/_fish_systemctl.fish
763share/fish/functions/_validate_int.fish 1036share/fish/functions/_validate_int.fish
764share/fish/functions/abbr.fish 1037share/fish/functions/abbr.fish
765share/fish/functions/alias.fish 1038share/fish/functions/alias.fish
766share/fish/functions/cd.fish 1039share/fish/functions/cd.fish
767share/fish/functions/cdh.fish 1040share/fish/functions/cdh.fish
768share/fish/functions/contains_seq.fish 1041share/fish/functions/contains_seq.fish
769share/fish/functions/delete-or-exit.fish 1042share/fish/functions/delete-or-exit.fish
770share/fish/functions/dirh.fish 1043share/fish/functions/dirh.fish
771share/fish/functions/dirs.fish 1044share/fish/functions/dirs.fish
772share/fish/functions/down-or-search.fish 1045share/fish/functions/down-or-search.fish
773share/fish/functions/edit_command_buffer.fish 1046share/fish/functions/edit_command_buffer.fish
774share/fish/functions/eval.fish 
775share/fish/functions/export.fish 1047share/fish/functions/export.fish
776share/fish/functions/fish_breakpoint_prompt.fish 1048share/fish/functions/fish_breakpoint_prompt.fish
777share/fish/functions/fish_clipboard_copy.fish 1049share/fish/functions/fish_clipboard_copy.fish
778share/fish/functions/fish_clipboard_paste.fish 1050share/fish/functions/fish_clipboard_paste.fish
779share/fish/functions/fish_config.fish 1051share/fish/functions/fish_config.fish
780share/fish/functions/fish_default_key_bindings.fish 1052share/fish/functions/fish_default_key_bindings.fish
781share/fish/functions/fish_default_mode_prompt.fish 1053share/fish/functions/fish_default_mode_prompt.fish
782share/fish/functions/fish_fallback_prompt.fish 1054share/fish/functions/fish_git_prompt.fish
 1055share/fish/functions/fish_hg_prompt.fish
783share/fish/functions/fish_hybrid_key_bindings.fish 1056share/fish/functions/fish_hybrid_key_bindings.fish
784share/fish/functions/fish_indent.fish 1057share/fish/functions/fish_indent.fish
785share/fish/functions/fish_key_reader.fish 1058share/fish/functions/fish_key_reader.fish
786share/fish/functions/fish_md5.fish 1059share/fish/functions/fish_md5.fish
787share/fish/functions/fish_mode_prompt.fish 1060share/fish/functions/fish_mode_prompt.fish
 1061share/fish/functions/fish_npm_helper.fish
788share/fish/functions/fish_opt.fish 1062share/fish/functions/fish_opt.fish
 1063share/fish/functions/fish_print_git_action.fish
789share/fish/functions/fish_print_hg_root.fish 1064share/fish/functions/fish_print_hg_root.fish
790share/fish/functions/fish_prompt.fish 1065share/fish/functions/fish_prompt.fish
 1066share/fish/functions/fish_svn_prompt.fish
791share/fish/functions/fish_title.fish 1067share/fish/functions/fish_title.fish
792share/fish/functions/fish_update_completions.fish 1068share/fish/functions/fish_update_completions.fish
 1069share/fish/functions/fish_vcs_prompt.fish
793share/fish/functions/fish_vi_cursor.fish 1070share/fish/functions/fish_vi_cursor.fish
794share/fish/functions/fish_vi_key_bindings.fish 1071share/fish/functions/fish_vi_key_bindings.fish
795share/fish/functions/fish_vi_mode.fish 
796share/fish/functions/funced.fish 1072share/fish/functions/funced.fish
797share/fish/functions/funcsave.fish 1073share/fish/functions/funcsave.fish
798share/fish/functions/grep.fish 1074share/fish/functions/grep.fish
799share/fish/functions/help.fish 1075share/fish/functions/help.fish
800share/fish/functions/history.fish 1076share/fish/functions/history.fish
801share/fish/functions/hostname.fish 1077share/fish/functions/hostname.fish
802share/fish/functions/isatty.fish 1078share/fish/functions/isatty.fish
803share/fish/functions/la.fish 1079share/fish/functions/la.fish
804share/fish/functions/ll.fish 1080share/fish/functions/ll.fish
805share/fish/functions/ls.fish 1081share/fish/functions/ls.fish
806share/fish/functions/man.fish 1082share/fish/functions/man.fish
807share/fish/functions/nextd-or-forward-word.fish 1083share/fish/functions/nextd-or-forward-word.fish
808share/fish/functions/nextd.fish 1084share/fish/functions/nextd.fish
809share/fish/functions/open.fish 1085share/fish/functions/open.fish
810share/fish/functions/popd.fish 1086share/fish/functions/popd.fish
811share/fish/functions/prevd-or-backward-word.fish 1087share/fish/functions/prevd-or-backward-word.fish
812share/fish/functions/prevd.fish 1088share/fish/functions/prevd.fish
813share/fish/functions/prompt_hostname.fish 1089share/fish/functions/prompt_hostname.fish
814share/fish/functions/prompt_pwd.fish 1090share/fish/functions/prompt_pwd.fish
815share/fish/functions/psub.fish 1091share/fish/functions/psub.fish
816share/fish/functions/pushd.fish 1092share/fish/functions/pushd.fish
817share/fish/functions/realpath.fish 1093share/fish/functions/realpath.fish
818share/fish/functions/seq.fish 1094share/fish/functions/seq.fish
819share/fish/functions/setenv.fish 1095share/fish/functions/setenv.fish
820share/fish/functions/string.fish 
821share/fish/functions/suspend.fish 1096share/fish/functions/suspend.fish
822share/fish/functions/trap.fish 1097share/fish/functions/trap.fish
823share/fish/functions/type.fish 1098share/fish/functions/type.fish
824share/fish/functions/umask.fish 1099share/fish/functions/umask.fish
825share/fish/functions/up-or-search.fish 1100share/fish/functions/up-or-search.fish
826share/fish/functions/vared.fish 1101share/fish/functions/vared.fish
827share/fish/groff/fish.tmac 1102share/fish/groff/fish.tmac
828share/fish/lynx.lss 1103share/fish/lynx.lss
829${PLIST.doc}share/fish/man/man1/abbr.1 1104share/fish/man/man1/abbr.1
830${PLIST.doc}share/fish/man/man1/alias.1 1105share/fish/man/man1/alias.1
831${PLIST.doc}share/fish/man/man1/and.1 1106share/fish/man/man1/and.1
832${PLIST.doc}share/fish/man/man1/argparse.1 1107share/fish/man/man1/argparse.1
833${PLIST.doc}share/fish/man/man1/begin.1 1108share/fish/man/man1/begin.1
834${PLIST.doc}share/fish/man/man1/bg.1 1109share/fish/man/man1/bg.1
835${PLIST.doc}share/fish/man/man1/bind.1 1110share/fish/man/man1/bind.1
836${PLIST.doc}share/fish/man/man1/block.1 1111share/fish/man/man1/block.1
837${PLIST.doc}share/fish/man/man1/break.1 1112share/fish/man/man1/break.1
838${PLIST.doc}share/fish/man/man1/breakpoint.1 1113share/fish/man/man1/breakpoint.1
839${PLIST.doc}share/fish/man/man1/builtin.1 1114share/fish/man/man1/builtin.1
840${PLIST.doc}share/fish/man/man1/case.1 1115share/fish/man/man1/case.1
841${PLIST.doc}share/fish/man/man1/cd.1 1116share/fish/man/man1/cd.1
842${PLIST.doc}share/fish/man/man1/cdh.1 1117share/fish/man/man1/cdh.1
843${PLIST.doc}share/fish/man/man1/command.1 1118share/fish/man/man1/command.1
844${PLIST.doc}share/fish/man/man1/commandline.1 1119share/fish/man/man1/commandline.1
845${PLIST.doc}share/fish/man/man1/complete.1 1120share/fish/man/man1/complete.1
846${PLIST.doc}share/fish/man/man1/contains.1 1121share/fish/man/man1/contains.1
847${PLIST.doc}share/fish/man/man1/continue.1 1122share/fish/man/man1/continue.1
848${PLIST.doc}share/fish/man/man1/count.1 1123share/fish/man/man1/count.1
849${PLIST.doc}share/fish/man/man1/dirh.1 1124share/fish/man/man1/dirh.1
850${PLIST.doc}share/fish/man/man1/dirs.1 1125share/fish/man/man1/dirs.1
851${PLIST.doc}share/fish/man/man1/disown.1 1126share/fish/man/man1/disown.1
852${PLIST.doc}share/fish/man/man1/echo.1 1127share/fish/man/man1/echo.1
853${PLIST.doc}share/fish/man/man1/else.1 1128share/fish/man/man1/else.1
854${PLIST.doc}share/fish/man/man1/emit.1 1129share/fish/man/man1/emit.1
855${PLIST.doc}share/fish/man/man1/end.1 1130share/fish/man/man1/end.1
856${PLIST.doc}share/fish/man/man1/eval.1 1131share/fish/man/man1/eval.1
857${PLIST.doc}share/fish/man/man1/exec.1 1132share/fish/man/man1/exec.1
858${PLIST.doc}share/fish/man/man1/exit.1 1133share/fish/man/man1/exit.1
859${PLIST.doc}share/fish/man/man1/false.1 1134share/fish/man/man1/false.1
860${PLIST.doc}share/fish/man/man1/fg.1 1135share/fish/man/man1/fg.1
861${PLIST.doc}share/fish/man/man1/fish.1 1136share/fish/man/man1/fish-doc.1
862${PLIST.doc}share/fish/man/man1/fish_breakpoint_prompt.1 1137share/fish/man/man1/fish-faq.1
863${PLIST.doc}share/fish/man/man1/fish_config.1 1138share/fish/man/man1/fish-tutorial.1
864${PLIST.doc}share/fish/man/man1/fish_indent.1 1139share/fish/man/man1/fish.1
865${PLIST.doc}share/fish/man/man1/fish_key_reader.1 1140share/fish/man/man1/fish_breakpoint_prompt.1
866${PLIST.doc}share/fish/man/man1/fish_mode_prompt.1 1141share/fish/man/man1/fish_config.1
867${PLIST.doc}share/fish/man/man1/fish_opt.1 1142share/fish/man/man1/fish_git_prompt.1
868${PLIST.doc}share/fish/man/man1/fish_prompt.1 1143share/fish/man/man1/fish_hg_prompt.1
869${PLIST.doc}share/fish/man/man1/fish_right_prompt.1 1144share/fish/man/man1/fish_indent.1
870${PLIST.doc}share/fish/man/man1/fish_update_completions.1 1145share/fish/man/man1/fish_key_reader.1
871${PLIST.doc}share/fish/man/man1/fish_vi_mode.1 1146share/fish/man/man1/fish_mode_prompt.1
872${PLIST.doc}share/fish/man/man1/for.1 1147share/fish/man/man1/fish_opt.1
873${PLIST.doc}share/fish/man/man1/funced.1 1148share/fish/man/man1/fish_prompt.1
874${PLIST.doc}share/fish/man/man1/funcsave.1 1149share/fish/man/man1/fish_right_prompt.1
875${PLIST.doc}share/fish/man/man1/function.1 1150share/fish/man/man1/fish_svn_prompt.1
876${PLIST.doc}share/fish/man/man1/functions.1 1151share/fish/man/man1/fish_update_completions.1
877${PLIST.doc}share/fish/man/man1/help.1 1152share/fish/man/man1/fish_vcs_prompt.1
878${PLIST.doc}share/fish/man/man1/history.1 1153share/fish/man/man1/for.1
879${PLIST.doc}share/fish/man/man1/if.1 1154share/fish/man/man1/funced.1
880${PLIST.doc}share/fish/man/man1/isatty.1 1155share/fish/man/man1/funcsave.1
881${PLIST.doc}share/fish/man/man1/jobs.1 1156share/fish/man/man1/function.1
882${PLIST.doc}share/fish/man/man1/math.1 1157share/fish/man/man1/functions.1
883${PLIST.doc}share/fish/man/man1/nextd.1 1158share/fish/man/man1/help.1
884${PLIST.doc}share/fish/man/man1/not.1 1159share/fish/man/man1/history.1
885${PLIST.doc}${PLIST.open}share/fish/man/man1/open.1 1160share/fish/man/man1/if.1
886${PLIST.doc}share/fish/man/man1/or.1 1161share/fish/man/man1/isatty.1
887${PLIST.doc}share/fish/man/man1/popd.1 1162share/fish/man/man1/jobs.1
888${PLIST.doc}share/fish/man/man1/prevd.1 1163share/fish/man/man1/math.1
889${PLIST.doc}share/fish/man/man1/printf.1 1164share/fish/man/man1/nextd.1
890${PLIST.doc}share/fish/man/man1/prompt_pwd.1 1165share/fish/man/man1/not.1
891${PLIST.doc}share/fish/man/man1/psub.1 1166share/fish/man/man1/or.1
892${PLIST.doc}share/fish/man/man1/pushd.1 1167${PLIST.open}share/fish/man/man1/open.1
893${PLIST.doc}share/fish/man/man1/pwd.1 1168share/fish/man/man1/popd.1
894${PLIST.doc}share/fish/man/man1/random.1 1169share/fish/man/man1/prevd.1
895${PLIST.doc}share/fish/man/man1/read.1 1170share/fish/man/man1/printf.1
896${PLIST.doc}share/fish/man/man1/realpath.1 1171share/fish/man/man1/prompt_pwd.1
897${PLIST.doc}share/fish/man/man1/return.1 1172share/fish/man/man1/psub.1
898${PLIST.doc}share/fish/man/man1/set.1 1173share/fish/man/man1/pushd.1
899${PLIST.doc}share/fish/man/man1/set_color.1 1174share/fish/man/man1/pwd.1
900${PLIST.doc}share/fish/man/man1/source.1 1175share/fish/man/man1/random.1
901${PLIST.doc}share/fish/man/man1/status.1 1176share/fish/man/man1/read.1
902${PLIST.doc}share/fish/man/man1/string.1 1177${PLIST.realpath}share/fish/man/man1/realpath.1
903${PLIST.doc}share/fish/man/man1/suspend.1 1178share/fish/man/man1/return.1
904${PLIST.doc}share/fish/man/man1/switch.1 1179share/fish/man/man1/set.1
905${PLIST.doc}share/fish/man/man1/test.1 1180share/fish/man/man1/set_color.1
906${PLIST.doc}share/fish/man/man1/trap.1 1181share/fish/man/man1/source.1
907${PLIST.doc}share/fish/man/man1/true.1 1182share/fish/man/man1/status.1
908${PLIST.doc}share/fish/man/man1/type.1 1183share/fish/man/man1/string-collect.1
909${PLIST.doc}share/fish/man/man1/ulimit.1 1184share/fish/man/man1/string-escape.1
910${PLIST.doc}share/fish/man/man1/umask.1 1185share/fish/man/man1/string-join.1
911${PLIST.doc}share/fish/man/man1/vared.1 1186share/fish/man/man1/string-join0.1
912${PLIST.doc}share/fish/man/man1/wait.1 1187share/fish/man/man1/string-length.1
913${PLIST.doc}share/fish/man/man1/while.1 1188share/fish/man/man1/string-lower.1
 1189share/fish/man/man1/string-match.1
 1190share/fish/man/man1/string-repeat.1
 1191share/fish/man/man1/string-replace.1
 1192share/fish/man/man1/string-split.1
 1193share/fish/man/man1/string-split0.1
 1194share/fish/man/man1/string-sub.1
 1195share/fish/man/man1/string-trim.1
 1196share/fish/man/man1/string-unescape.1
 1197share/fish/man/man1/string-upper.1
 1198share/fish/man/man1/string.1
 1199share/fish/man/man1/suspend.1
 1200share/fish/man/man1/switch.1
 1201share/fish/man/man1/test.1
 1202share/fish/man/man1/time.1
 1203share/fish/man/man1/trap.1
 1204share/fish/man/man1/true.1
 1205share/fish/man/man1/type.1
 1206share/fish/man/man1/ulimit.1
 1207share/fish/man/man1/umask.1
 1208share/fish/man/man1/vared.1
 1209share/fish/man/man1/wait.1
 1210share/fish/man/man1/while.1
914share/fish/tools/create_manpage_completions.py 1211share/fish/tools/create_manpage_completions.py
915share/fish/tools/deroff.py 1212share/fish/tools/deroff.py
916share/fish/tools/web_config/delete.png 1213share/fish/tools/web_config/delete.png
917share/fish/tools/web_config/favicon.png 1214share/fish/tools/web_config/favicon.png
918share/fish/tools/web_config/fishconfig.css 1215share/fish/tools/web_config/fishconfig.css
919share/fish/tools/web_config/index.html 1216share/fish/tools/web_config/index.html
920share/fish/tools/web_config/js/angular-sanitize.js 1217share/fish/tools/web_config/js/angular-sanitize.js
921share/fish/tools/web_config/js/angular.js 1218share/fish/tools/web_config/js/angular.js
922share/fish/tools/web_config/js/app.js 1219share/fish/tools/web_config/js/app.js
923share/fish/tools/web_config/js/colorutils.js 1220share/fish/tools/web_config/js/colorutils.js
924share/fish/tools/web_config/js/controllers.js 1221share/fish/tools/web_config/js/controllers.js
925share/fish/tools/web_config/js/filters.js 1222share/fish/tools/web_config/js/filters.js
926share/fish/tools/web_config/partials/abbreviations.html 1223share/fish/tools/web_config/partials/abbreviations.html
@@ -950,16 +1247,16 @@ share/fish/tools/web_config/webconfig.py @@ -950,16 +1247,16 @@ share/fish/tools/web_config/webconfig.py
950share/locale/de/LC_MESSAGES/fish.mo 1247share/locale/de/LC_MESSAGES/fish.mo
951share/locale/en/LC_MESSAGES/fish.mo 1248share/locale/en/LC_MESSAGES/fish.mo
952share/locale/fr/LC_MESSAGES/fish.mo 1249share/locale/fr/LC_MESSAGES/fish.mo
953share/locale/nb/LC_MESSAGES/fish.mo 1250share/locale/nb/LC_MESSAGES/fish.mo
954share/locale/nn/LC_MESSAGES/fish.mo 1251share/locale/nn/LC_MESSAGES/fish.mo
955share/locale/pl/LC_MESSAGES/fish.mo 1252share/locale/pl/LC_MESSAGES/fish.mo
956share/locale/pt_BR/LC_MESSAGES/fish.mo 1253share/locale/pt_BR/LC_MESSAGES/fish.mo
957share/locale/sv/LC_MESSAGES/fish.mo 1254share/locale/sv/LC_MESSAGES/fish.mo
958share/locale/zh_CN/LC_MESSAGES/fish.mo 1255share/locale/zh_CN/LC_MESSAGES/fish.mo
959share/pkgconfig/fish.pc 1256share/pkgconfig/fish.pc
960@pkgdir share/fish/vendor_functions.d 1257@pkgdir share/fish/vendor_functions.d
961@pkgdir share/fish/vendor_conf.d 1258@pkgdir share/fish/vendor_conf.d
962@pkgdir share/fish/vendor_completions.d 1259@pkgdir share/fish/vendor_completions.d
963@pkgdir share/examples/fish/functions 1260@pkgdir etc/fish/functions
964@pkgdir share/examples/fish/conf.d 1261@pkgdir etc/fish/conf.d
965@pkgdir share/examples/fish/completions 1262@pkgdir etc/fish/completions

cvs diff -r1.15 -r1.16 pkgsrc/shells/fish/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/fish/distinfo 2019/11/09 12:02:29 1.15
+++ pkgsrc/shells/fish/distinfo 2020/02/18 22:00:49 1.16
@@ -1,16 +1,11 @@ @@ -1,16 +1,11 @@
1$NetBSD: distinfo,v 1.15 2019/11/09 12:02:29 nia Exp $ 1$NetBSD: distinfo,v 1.16 2020/02/18 22:00:49 maya Exp $
2 2
3SHA1 (fish-3.0.2.tar.gz) = cfd7f12e671be3b49070adc360c22873c8288d1d 3SHA1 (fish-3.1.0.tar.gz) = ff863d58bcd5151f1235f8adaacebc2564f11fd4
4RMD160 (fish-3.0.2.tar.gz) = 95ec9e8ed70c07dd2cb057c127a1a98e2bb78036 4RMD160 (fish-3.1.0.tar.gz) = 75fbb9270035b6f172d3b1d7781430eb1e638c83
5SHA512 (fish-3.0.2.tar.gz) = d3a24f85d4ada891ec4f6b14733edb236ae67f34868b0c9115fa5ebae99202a747ee9aeec7c6b04702f9a608019d5964b9cdc9abc4e3edfd7aaa9335093d8881 5SHA512 (fish-3.1.0.tar.gz) = 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
6Size (fish-3.0.2.tar.gz) = 6229935 bytes 6Size (fish-3.1.0.tar.gz) = 6810953 bytes
7SHA1 (patch-Makefile.in) = 279d0a77ae52470150f4293a10c26e269fd25cee 7SHA1 (patch-cmake_ConfigureChecks.cmake) = f673d726b42a60adff60b7e53783a1a2d0e76394
8SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d 8SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156
9SHA1 (patch-share_functions_man.fish) = c31cf77efe66a26d24f31ae005838799bb70746e 9SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef
10SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc 10SHA1 (patch-src_fallback.cpp) = 021d454b12e1b9ac45b5820236e5b0742f25e20d
11SHA1 (patch-src_fallback.cpp) = b6da274e326caa1f4c503874411dd1b1db224374 11SHA1 (patch-src_wutil.cpp) = f016ef23b3e3ad7937e944bf341cc6ce0a3f0257
12SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b 
13SHA1 (patch-src_output.cpp) = 1a05bc3db70f2ecf60789fe8972db37db7ae0b90 
14SHA1 (patch-src_output.h) = 6d6266ea19436c3f24b8e097dfa36591a790b718 
15SHA1 (patch-src_screen.cpp) = d0a60ff4e868383ebd086bc4bc724237c13f05ed 
16SHA1 (patch-src_wutil.cpp) = b391552d02b8130070ddcdab7fb1c874a641b922 

File Deleted: pkgsrc/shells/fish/Attic/options.mk

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-Makefile.in

File Added: pkgsrc/shells/fish/patches/patch-cmake_ConfigureChecks.cmake
$NetBSD: patch-cmake_ConfigureChecks.cmake,v 1.1 2020/02/18 22:00:49 maya Exp $

put #define TPARM_VARARGS to get the varargs tparm.
(For netbsd curses)

Simply variadic tparm logic, and make sure it doesn't consider the
"solaris (curses) kludge" necessary on netbsd.

--- cmake/ConfigureChecks.cmake.orig	2020-02-12 14:04:07.000000000 +0000
+++ cmake/ConfigureChecks.cmake
@@ -158,25 +158,26 @@ int main () {
 "
   TPARM_TAKES_VARARGS
 )
-IF(NOT TPARM_TAKES_VARARGS)
-  CHECK_CXX_SOURCE_COMPILES("
-${TPARM_INCLUDES}
+
+CHECK_CXX_SOURCE_COMPILES("
 #define TPARM_VARARGS
+${TPARM_INCLUDES}
 
 int main () {
   tparm( \"\" );
 }
 "
-    TPARM_TAKES_VARARGS_WITH_VARARGS
-    )
-  IF(NOT TPARM_TAKES_VARARGS)
-    SET(TPARM_SOLARIS_KLUDGE 1)
-  ELSE()
-    SET(TPARM_VARARGS 1)
-  ENDIF()
-ENDIF()
+  TPARM_TAKES_VARARGS_WITH_VARARGS
+)
 CMAKE_POP_CHECK_STATE()
 
+IF(TPARM_TAKES_VARARGS)
+ELSEIF(TPARM_TAKES_VARARGS_WITH_VARARGS)
+  SET(TPARM_VARARGS 1)
+ELSE()
+  SET(TPARM_SOLARIS_KLUDGE 1)
+ENDIF()
+
 # Work around the fact that cmake does not propagate the language standard flag into
 # the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
 # Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++

File Added: pkgsrc/shells/fish/patches/Attic/patch-config__cmake.h.in
$NetBSD: patch-config__cmake.h.in,v 1.1 2020/02/18 22:00:49 maya Exp $

--- config_cmake.h.in.orig	2020-02-12 14:04:07.000000000 +0000
+++ config_cmake.h.in
@@ -144,6 +144,9 @@
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "fish"
+#
+/* Define to 1 if tparm accepts a fixed amount of parameters. */
+#cmakedefine TPARM_VARARGS 1
 
 /* Define to 1 if tparm accepts a fixed amount of parameters. */
 #cmakedefine TPARM_SOLARIS_KLUDGE 1

File Added: pkgsrc/shells/fish/patches/Attic/patch-src_common.cpp
$NetBSD: patch-src_common.cpp,v 1.1 2020/02/18 22:00:49 maya Exp $

Cast to const char*, makes netbsd (const void* dli_saddr) happier.

--- src/common.cpp.orig	2020-02-12 14:04:07.000000000 +0000
+++ src/common.cpp
@@ -225,7 +225,7 @@ bool is_windows_subsystem_for_linux() {
             swprintf(
                 text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels,
                 status == 0 ? demangled : info.dli_sname == nullptr ? symbols[i] : info.dli_sname,
-                static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr));
+                static_cast<char *>(callstack[i]) - static_cast<const char *>(info.dli_saddr));
             free(demangled);
         } else {
             swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s", i - skip_levels, symbols[i]);

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-configure.ac

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-src_fallback.h

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-src_output.cpp

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-src_output.h

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-src_screen.cpp

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-share_functions_man.fish

File Deleted: pkgsrc/shells/fish/patches/Attic/patch-src_builtin.cpp

cvs diff -r1.2 -r1.3 pkgsrc/shells/fish/patches/Attic/patch-src_fallback.cpp (expand / switch to unified diff)

--- pkgsrc/shells/fish/patches/Attic/patch-src_fallback.cpp 2019/02/12 16:49:31 1.2
+++ pkgsrc/shells/fish/patches/Attic/patch-src_fallback.cpp 2020/02/18 22:00:49 1.3
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-src_fallback.cpp,v 1.2 2019/02/12 16:49:31 maya Exp $ 1$NetBSD: patch-src_fallback.cpp,v 1.3 2020/02/18 22:00:49 maya Exp $
2 2
3constify, for clang 3constify, for clang
4 4
5--- src/fallback.cpp.orig 2018-12-28 13:01:03.000000000 +0000 5--- src/fallback.cpp.orig 2020-02-12 14:04:07.000000000 +0000
6+++ src/fallback.cpp 6+++ src/fallback.cpp
7@@ -46,7 +46,7 @@ 7@@ -47,8 +47,8 @@
8 #ifdef TPARM_SOLARIS_KLUDGE 8 #if defined(TPARM_SOLARIS_KLUDGE)
9 #undef tparm 9 #undef tparm
10  10
11-char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, 11-char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, long p5, long p6, long p7,
 12- long p8, long p9) {
12+char *tparm_solaris_kludge(const char *str, long p1, long p2, long p3, long p4, 13+char *tparm_solaris_kludge(const char *str, long p1, long p2, long p3, long p4,
13 long p5, long p6, long p7, long p8, long p9) { 14+ long p5, long p6, long p7, long p8, long p9) {
14 return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9); 15 return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9);
15 } 16 }
 17

cvs diff -r1.3 -r1.4 pkgsrc/shells/fish/patches/Attic/patch-src_wutil.cpp (expand / switch to unified diff)

--- pkgsrc/shells/fish/patches/Attic/patch-src_wutil.cpp 2019/02/12 16:49:31 1.3
+++ pkgsrc/shells/fish/patches/Attic/patch-src_wutil.cpp 2020/02/18 22:00:49 1.4
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: patch-src_wutil.cpp,v 1.3 2019/02/12 16:49:31 maya Exp $ 1$NetBSD: patch-src_wutil.cpp,v 1.4 2020/02/18 22:00:49 maya Exp $
2 2
3fstatfs appears to be linux-specific, let's not try it on non-linux 3fstatfs appears to be linux-specific, let's not try it on non-linux
4 4
5--- src/wutil.cpp.orig 2018-12-28 13:01:03.000000000 +0000 5--- src/wutil.cpp.orig 2020-02-12 14:04:07.000000000 +0000
6+++ src/wutil.cpp 6+++ src/wutil.cpp
7@@ -311,10 +311,6 @@ int fd_check_is_remote(int fd) { 7@@ -320,7 +320,7 @@ int fd_check_is_remote(int fd) {
8 // Other FSes are assumed local. 8 struct statvfs buf {};
9 return 0; 9 if (fstatvfs(fd, &buf) < 0) return -1;
10 } 10 return (buf.f_flag & ST_LOCAL) ? 0 : 1;
11-#elif defined(MNT_LOCAL) 11-#elif defined(MNT_LOCAL)
12- struct statfs buf {}; 12+#elif defined(MNT_LOCAL) && defined(__linux__)
13- if (fstatfs(fd, &buf) < 0) return -1; 13 struct statfs buf {};
14- return (buf.f_flags & MNT_LOCAL) ? 0 : 1; 14 if (fstatfs(fd, &buf) < 0) return -1;
15 #else 15 return (buf.f_flags & MNT_LOCAL) ? 0 : 1;
16 return -1; 
17 #endif