1 files changed, 7 insertions, 5 deletions

diff --git a/vimrcs/codecmd.vim b/vimrcs/codecmd.vim
index 179e68e..8ca51f6 100644
--- a/vimrcs/codecmd.vim
+++ b/vimrcs/codecmd.vim
@@ -2,7 +2,7 @@ set expandtab			" 设置tab键替换为tabstop规定的空格数
 set tabstop=4                   " 编辑时tab键占用的空格数
 set shiftwidth=4                " 设置tab的间隔（格式化时）
 set softtabstop=4               " 设置退格键退格的空格数，让vim把连续的空格当作一个tab
-autocmd FileType asm,nasm,vim,sh,makefile set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab
+autocmd FileType *asm,vim,*sh,makefile set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab
 
 set showmatch                   " 在输入括号时光标会短暂地跳到与之相匹配的括号处
 set nowrap                              " 设置自动折行
@@ -31,7 +31,6 @@ function! PreserveCursorAndFormat()
         call winrestview(l:save_view)
 endfunction
 
-
 command! -nargs=0 ClangFormat :call ClangFormat()
 autocmd FileType c,h,cpp,hpp,cc nnoremap <buffer> gg=G :ClangFormat<CR>
 " 定义ClangFormat命令：
@@ -39,10 +38,13 @@ autocmd FileType c,h,cpp,hpp,cc nnoremap <buffer> gg=G :ClangFormat<CR>
 " 否则使用默认规则，缩进为4
 function! ClangFormat()
         let clang_format = "clang-format"
-        " find .clang-format file from cur path upward
-        let clang_format_file = findfile(".clang-format", ".;")
+        if !executable(clang_format)
+                normal gg=G
+                return
+        endif
+        let clang_format_file = findfile(".clang-format", expand('%:p:h') . ";")
         if clang_format_file != ""
-                let clang_format = clang_format . " -style=file"
+                let clang_format = clang_format . " -style=file:" . clang_format_file
         else
                 let clang_format = clang_format . " -style='{IndentWidth: 4}'"
         endif