[llvm-commits] [llvm] r61582 - in /llvm/trunk/utils/vim: llvm.vim tablegen.vim vimrc

[Misha Brukman]

Author: brukman
Date: Fri Jan  2 10:26:14 2009
New Revision: 61582

URL: http://llvm.org/viewvc/llvm-project?rev=61582&view=rev
Log:
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

Modified:
    llvm/trunk/utils/vim/llvm.vim
    llvm/trunk/utils/vim/tablegen.vim
    llvm/trunk/utils/vim/vimrc

Modified: llvm/trunk/utils/vim/llvm.vim
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/llvm.vim?rev=61582&r1=61581&r2=61582&view=diff

==============================================================================
--- llvm/trunk/utils/vim/llvm.vim (original)
+++ llvm/trunk/utils/vim/llvm.vim Fri Jan  2 10:26:14 2009
@@ -65,5 +65,5 @@
 
   delcommand HiLink
 endif
- 
+
 let b:current_syntax = "llvm"

Modified: llvm/trunk/utils/vim/tablegen.vim
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/tablegen.vim?rev=61582&r1=61581&r2=61582&view=diff

==============================================================================
--- llvm/trunk/utils/vim/tablegen.vim (original)
+++ llvm/trunk/utils/vim/tablegen.vim Fri Jan  2 10:26:14 2009
@@ -50,5 +50,5 @@
 
   delcommand HiLink
 endif
- 
+
 let b:current_syntax = "tablegen"

Modified: llvm/trunk/utils/vim/vimrc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/vimrc?rev=61582&r1=61581&r2=61582&view=diff

==============================================================================
--- llvm/trunk/utils/vim/vimrc (original)
+++ llvm/trunk/utils/vim/vimrc Fri Jan  2 10:26:14 2009
@@ -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 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 @@
 " 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 @@
 " 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