diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/__fish_build_paths.fish.in | 4 | ||||
| -rw-r--r-- | share/config.fish | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/__fish_build_paths.fish.in b/share/__fish_build_paths.fish.in index 4b923d7e..8308cf50 100644 --- a/share/__fish_build_paths.fish.in +++ b/share/__fish_build_paths.fish.in @@ -1,8 +1,8 @@ # @configure_input@ # This function is generated by the autotools build to "compile in" -# the local "vendor" completions, functions and configuration snippets. +# the local "vendor" completions, functions and configuration conf. # It is sourced by share/config.fish, if it exists. set __extra_completionsdir @extra_completionsdir@ set __extra_functionsdir @extra_functionsdir@ -set __extra_snippetsdir @extra_snippetsdir@ +set __extra_confdir @extra_confdir@ diff --git a/share/config.fish b/share/config.fish index 3f798652..86e8d9b7 100644 --- a/share/config.fish +++ b/share/config.fish @@ -49,7 +49,7 @@ end # third-party packages to ship completions &c. set -l __extra_completionsdir set -l __extra_functionsdir -set -l __extra_snippetsdir +set -l __extra_confdir if test -f $__fish_datadir/__fish_build_paths.fish source $__fish_datadir/__fish_build_paths.fish end @@ -166,7 +166,7 @@ end # As last part of initialization, source the conf directories # Implement precedence (User > Admin > Extra (e.g. vendors) > Fish) by basically doing "basename" set -l sourcelist -for file in $configdir/fish/conf.d/*.fish $__fish_sysconfdir/conf.d/*.fish $__extra_snippetsdir/*.fish +for file in $configdir/fish/conf.d/*.fish $__fish_sysconfdir/conf.d/*.fish $__extra_confdir/*.fish set -l basename (string replace -r '^.*/' '' -- $file) contains -- $basename $sourcelist; and continue set sourcelist $sourcelist $basename |