Mercurial > vim
comparison src/ex_docmd.c @ 8524:2f57bbe870ea v7.4.1552
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 12 22:11:39 2016 +0100
patch 7.4.1552
Problem: ":colorscheme" does not use 'packpath'.
Solution: Also use in "start" and "opt" directories in 'packpath'.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 12 Mar 2016 22:15:05 +0100 |
parents | eed1ca42f9aa |
children | 63dc856bd13d |
comparison
equal
deleted
inserted
replaced
8523:299f84e1e738 | 8524:2f57bbe870ea |
---|---|
11775 } | 11775 } |
11776 if (STRCMP(arg, "on") == 0 || STRCMP(arg, "detect") == 0) | 11776 if (STRCMP(arg, "on") == 0 || STRCMP(arg, "detect") == 0) |
11777 { | 11777 { |
11778 if (*arg == 'o' || !filetype_detect) | 11778 if (*arg == 'o' || !filetype_detect) |
11779 { | 11779 { |
11780 source_runtime((char_u *)FILETYPE_FILE, TRUE); | 11780 source_runtime((char_u *)FILETYPE_FILE, DIP_ALL); |
11781 filetype_detect = TRUE; | 11781 filetype_detect = TRUE; |
11782 if (plugin) | 11782 if (plugin) |
11783 { | 11783 { |
11784 source_runtime((char_u *)FTPLUGIN_FILE, TRUE); | 11784 source_runtime((char_u *)FTPLUGIN_FILE, DIP_ALL); |
11785 filetype_plugin = TRUE; | 11785 filetype_plugin = TRUE; |
11786 } | 11786 } |
11787 if (indent) | 11787 if (indent) |
11788 { | 11788 { |
11789 source_runtime((char_u *)INDENT_FILE, TRUE); | 11789 source_runtime((char_u *)INDENT_FILE, DIP_ALL); |
11790 filetype_indent = TRUE; | 11790 filetype_indent = TRUE; |
11791 } | 11791 } |
11792 } | 11792 } |
11793 if (*arg == 'd') | 11793 if (*arg == 'd') |
11794 { | 11794 { |
11800 { | 11800 { |
11801 if (plugin || indent) | 11801 if (plugin || indent) |
11802 { | 11802 { |
11803 if (plugin) | 11803 if (plugin) |
11804 { | 11804 { |
11805 source_runtime((char_u *)FTPLUGOF_FILE, TRUE); | 11805 source_runtime((char_u *)FTPLUGOF_FILE, DIP_ALL); |
11806 filetype_plugin = FALSE; | 11806 filetype_plugin = FALSE; |
11807 } | 11807 } |
11808 if (indent) | 11808 if (indent) |
11809 { | 11809 { |
11810 source_runtime((char_u *)INDOFF_FILE, TRUE); | 11810 source_runtime((char_u *)INDOFF_FILE, DIP_ALL); |
11811 filetype_indent = FALSE; | 11811 filetype_indent = FALSE; |
11812 } | 11812 } |
11813 } | 11813 } |
11814 else | 11814 else |
11815 { | 11815 { |
11816 source_runtime((char_u *)FTOFF_FILE, TRUE); | 11816 source_runtime((char_u *)FTOFF_FILE, DIP_ALL); |
11817 filetype_detect = FALSE; | 11817 filetype_detect = FALSE; |
11818 } | 11818 } |
11819 } | 11819 } |
11820 else | 11820 else |
11821 EMSG2(_(e_invarg2), arg); | 11821 EMSG2(_(e_invarg2), arg); |