From 200a10e78d0df7001c6c2a7c71e7139cccf4277c Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 5 Apr 2016 22:22:12 +0800 Subject: Rename "snippets" to "conf" internally, and document them as snippets Discussed in #2896. --- share/config.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share/config.fish') 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 -- cgit v1.2.3