Skip to content

Commit

Permalink
Merge PR #377 from master into v2 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Alhadis committed Jun 1, 2016
2 parents 5f1b28b + f0604a5 commit 3255ede
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Empty file added examples/viminfo
Empty file.
6 changes: 3 additions & 3 deletions lib/config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2681,12 +2681,12 @@ module.exports.fileIcons =
scope: "shell"
alias: /sh|shell|Shell-?Script|Bash/i
interpreter: /bash|sh|zsh|rc/]
[/^(?:\.?bash(?:rc|_(?:profile|login|logout|history))|_osc|install-sh|PKGBUILD)$/i, "medium-purple"]
[/^(?:\.?bash(?:rc|_(?:profile|login|logout|history))|_osc|config|install-sh|PKGBUILD)$/i, "medium-purple"]
[".ksh", "dark-yellow"]
[".sh-session", "auto-yellow"
scope: "shell-session"
alias: /(?:Bash|Shell|Sh)[-\s]?Session|Console/i]
[/\.zsh(?:-theme)?$|^\.?(?:zlogin|zlogout|zprofile|zshenv|zshrc)$/i, "medium-blue"]
[/\.zsh(?:-theme|_history)?$|^\.?(?:zlogin|zlogout|zprofile|zshenv|zshrc)$/i, "medium-blue"]
[/\.fish$|^\.fishrc$/i, "medium-green", "fish"]
[".sh.in", "dark-red"]
[".tmux", "medium-blue"]
Expand Down Expand Up @@ -3123,7 +3123,7 @@ module.exports.fileIcons =
icon: "vim"
match: [
[/\.(?:vim|n?vimrc)$/i, "medium-green", scope: "viml", alias: /VimL?|NVim|Vim\s?Script/i, interpreter: /Vim?/i]
[/^[gn_]?vimrc$/i, "medium-green"]
[/^[gn_]?vim(?:rc|info)$/i, "dark-green"]
]

"Visual Studio":
Expand Down

0 comments on commit 3255ede

Please sign in to comment.