diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2016-04-05 22:22:12 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2016-04-06 09:33:09 +0800 |
| commit | 200a10e78d0df7001c6c2a7c71e7139cccf4277c (patch) | |
| tree | c4f7027bd4948441a4c229b0b346684d5c7b6589 /share/config.fish | |
| parent | 9e93ddc0978644d0670e192052619bb4710041e7 (diff) | |
Rename "snippets" to "conf" internally, and document them as snippets
Discussed in #2896.
Diffstat (limited to 'share/config.fish')
| -rw-r--r-- | share/config.fish | 4 |
1 files changed, 2 insertions, 2 deletions
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 |