# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1285886770 14400
# Node ID defeed18f08cce45a9b4981919df793aea3cd4a5
# Parent  07500b0af610e9c49ac0cd4375e0e224f40513ea# Parent  7defffaa1a1924392c9dbbd87130a56aab05dfd1
Merge.

diff -r 7defffaa1a19 -r defeed18f08c vim/syntax/cram.vim
--- a/vim/syntax/cram.vim	Thu Sep 30 16:40:41 2010 -0400
+++ b/vim/syntax/cram.vim	Thu Sep 30 18:46:10 2010 -0400
@@ -34,4 +34,8 @@
 syn sync match cramSync grouphere NONE "^$"
 syn sync maxlines=200
 
+" It's okay to set tab settings here, because an indent of two spaces is specified
+" by the file format.
+setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab
+
 let b:current_syntax = "cram"