diff options
| -rw-r--r-- | doc_src/index.hdr.in | 2 | ||||
| -rw-r--r-- | share/config.fish | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index ed497a99..ff2d5ab3 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -1088,7 +1088,7 @@ function on_exit --on-process %self end \endfish -Right after reading /usr/share/fish/config.fish and before reading /etc/fish/config.fish, fish will also read files in ~/.config/fish/conf.d/, /etc/fish/conf.d and /usr/share/fish/vendor_conf.d (the exact values depend on $XDG_CONFIG_HOME, $__fish_sysconfdir and $__fish_datadir). If there are files with the same name in two or all of these, fish will only attempt to read the first (skipping all files with that name if it is unreadable). ~/.config takes precedence over /etc/ which takes precedence over /usr. The path to the latter can also be gotten via `pkg-config` as "confdir", and is meant for third-party applications to integrate with fish. +Right after reading /usr/share/fish/config.fish and before reading /etc/fish/config.fish, fish will also read files ending in ".fish" in ~/.config/fish/conf.d/, /etc/fish/conf.d and /usr/share/fish/vendor_conf.d (the exact values depend on $XDG_CONFIG_HOME, $__fish_sysconfdir and $__fish_datadir). If there are files with the same name in two or all of these, fish will only attempt to read the first (skipping all files with that name if it is unreadable). ~/.config takes precedence over /etc/ which takes precedence over /usr. The path to the latter can also be gotten via `pkg-config` as "confdir", and is meant for third-party applications to integrate with fish. \section other Other features diff --git a/share/config.fish b/share/config.fish index 9ed3250a..fe45f70d 100644 --- a/share/config.fish +++ b/share/config.fish @@ -157,7 +157,7 @@ end # As last part of initialization, source the conf directories # Implement precedence (User > Admin > Vendors > Fish) by basically doing "basename" set -l sourcelist -for file in $configdir/fish/conf.d/* $__fish_sysconfdir/conf.d/* $__fish_datadir/vendor_conf.d/* +for file in $configdir/fish/conf.d/*.fish $__fish_sysconfdir/conf.d/*.fish $__fish_datadir/vendor_conf.d/*.fish set -l basename (string replace -r '^.*/' '' -- $file) contains -- $basename $sourcelist; and continue set sourcelist $sourcelist $basename |