aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-29 16:26:37 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-29 16:41:45 +1200
commita019f8e837d9e641a955f928ded00be4db149957 (patch)
treeea31567eeb05bfbdcd959f363b1ba0f566d85909
parentUpdate strip_trailing_whitespace.vim plugin (diff)
downloaddotfiles-a019f8e837d9e641a955f928ded00be4db149957.tar.gz
dotfiles-a019f8e837d9e641a955f928ded00be4db149957.zip
Set 'include' and 'path' specifically in C/C++
Otherwise, use defaults that should be meaningful in other languages too, just to be tidy and not to show string.h in :find results when editing Awk scripts.
-rw-r--r--vim/after/ftplugin/c/include.vim22
-rw-r--r--vim/after/ftplugin/cpp/include.vim22
-rw-r--r--vim/vimrc7
3 files changed, 49 insertions, 2 deletions
diff --git a/vim/after/ftplugin/c/include.vim b/vim/after/ftplugin/c/include.vim
new file mode 100644
index 00000000..ce78d495
--- /dev/null
+++ b/vim/after/ftplugin/c/include.vim
@@ -0,0 +1,22 @@
+" c/include.vim: Set 'include' and 'path'
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
+ finish
+endif
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_c_include')
+ finish
+endif
+
+" Flag as loaded
+let b:did_ftplugin_c_include = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_c_include'
+
+" Use trailing whitespace to denote continued paragraph
+setlocal include=^\\s*#\\s*include
+setlocal path+=/usr/include
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|setlocal include< path<'
diff --git a/vim/after/ftplugin/cpp/include.vim b/vim/after/ftplugin/cpp/include.vim
new file mode 100644
index 00000000..6c039287
--- /dev/null
+++ b/vim/after/ftplugin/cpp/include.vim
@@ -0,0 +1,22 @@
+" c/include.vim: Set 'include' and 'path'
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
+ finish
+endif
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_cpp_include')
+ finish
+endif
+
+" Flag as loaded
+let b:did_ftplugin_cpp_include = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_cpp_include'
+
+" Use trailing whitespace to denote continued paragraph
+setlocal include=^\\s*#\\s*include
+setlocal path+=/usr/include
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|setlocal include< path<'
diff --git a/vim/vimrc b/vim/vimrc
index f48f31b6..73f6b48b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -74,6 +74,9 @@ if v:version > 703 || v:version == 703 && has('patch541')
set formatoptions+=j
endif
+" Don't assume I'm editing C; let the filetype set this
+set include=
+
" Don't join lines with two spaces at the end of sentences
set nojoinspaces
@@ -124,9 +127,9 @@ if has('extra_search')
set incsearch " Show matches as I type
endif
-" Use whole tree from current directory for :find
+" More sensible language-agnostic setting for gf/:find
if has('file_in_path')
- set path+=**
+ set path=.,,**
endif
" Don't load GUI menus; set here before GUI starts