vimrc

* Fixed cursors in terminal by setting nocompatible (sorry, vi users)
* Enable syntax highlighting so that this file can stand on its own
* Highlight trailing whitespace
* Fixed commands to delete trailing whitespaces and convert tabs to spaces

llvm.vim and tablegen.vim
* Removed trailing whitespace, as it's now very visible


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61582 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 20 insertions, 7 deletions

diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim
index b878da471c..b1ddcfef98 100644
--- a/utils/vim/llvm.vim
+++ b/utils/vim/llvm.vim
@@ -65,5 +65,5 @@ if version >= 508 || !exists("did_c_syn_inits")
 
   delcommand HiLink
 endif
- 
+
 let b:current_syntax = "llvm"
diff --git a/utils/vim/tablegen.vim b/utils/vim/tablegen.vim
index d786d1463e..ad358728e5 100644
--- a/utils/vim/tablegen.vim
+++ b/utils/vim/tablegen.vim
@@ -50,5 +50,5 @@ if version >= 508 || !exists("did_c_syn_inits")
 
   delcommand HiLink
 endif
- 
+
 let b:current_syntax = "tablegen"
diff --git a/utils/vim/vimrc b/utils/vim/vimrc
index 3c872d9862..586100de15 100644
--- a/utils/vim/vimrc
+++ b/utils/vim/vimrc
@@ -1,8 +1,14 @@
 " LLVM coding guidelines conformance for VIM
-" Maintainer: LLVM Team, http://llvm.cs.uiuc.edu
-" Updated:    2005-04-24
+"
+" Maintainer: The LLVM Team, http://llvm.org
 " WARNING:    Read before you source in all these commands and macros!  Some
 "             of them may change VIM behavior that you depend on.
+"
+" You can run VIM with these settings without changing your current setup with:
+" $ vim -u /path/to/llvm/utils/vim/vimrc
+
+" It's VIM, not VI
+set nocompatible
 
 " Wrap text at 80 cols
 set textwidth=80
@@ -12,6 +18,10 @@ set tabstop=2
 set shiftwidth=2
 set expandtab
 
+" Highlight trailing whitespace
+highlight WhitespaceEOL ctermbg=DarkYellow guibg=DarkYellow
+match WhitespaceEOL /\s\+$/
+
 " Optional
 " C/C++ programming helpers
 set autoindent
@@ -19,13 +29,16 @@ set smartindent
 " Add and delete spaces in increments of `shiftwidth' for tabs
 set smarttab
 
+" Highlight syntax in programming languages
+syntax on
+
 " Enable filetype detection
 filetype on
 
 " LLVM Makefiles can have names such as Makefile.rules or TEST.nightly.Makefile,
 " so it's important to categorize them as such.
 augroup filetype
-  au! BufRead,BufNewFile *Makefile*     set filetype=make
+  au! BufRead,BufNewFile *Makefile* set filetype=make
 augroup END
 
 " In Makefiles, don't expand tabs to spaces, since we need the actual tabs
@@ -34,7 +47,7 @@ autocmd FileType make set noexpandtab
 " Useful macros for cleaning up code to conform to LLVM coding guidelines
 
 " Delete trailing whitespace and tabs at the end of each line
-map :dtws :%s/[\ \t]\+$//
+command! DeleteTrailingWs :%s/[\ \t]\+$//
 
 " Convert all tab characters to two spaces
-map :untab :%s/\t/  /g
+command! Untab :%s/\t/  /g