Merge branch '3.0' of github.com:spf13/spf13-vim into 3.0

Author: spf13

.vimrc

@@ -127,6 +127,11 @@
 
     " Setting up the directories {
         set backup                      " backups are nice ...
+        if has('persistent_undo')
+            set undofile                "so is persistent undo ...
+            set undolevels=1000         "maximum number of changes that can be undone
+            set undoreload=10000        "maximum number lines to save for undo on a buffer reload
+        endif
         " Could use * rather than *.*, but I prefer to leave .files unsaved
         au BufWinLeave *.* silent! mkview  "make vim save view (state) (folds, cursor, etc)
         au BufWinEnter *.* silent! loadview "make vim load view (state) (folds, cursor, etc)
@@ -507,29 +512,33 @@
  " Functions {
 
 function! InitializeDirectories()
-  let separator = "."
-  let parent = $HOME
-  let prefix = '.vim'
-  let dir_list = {
-              \ 'backup': 'backupdir',
-              \ 'views': 'viewdir',
-              \ 'swap': 'directory' }
-
-  for [dirname, settingname] in items(dir_list)
-      let directory = parent . '/' . prefix . dirname . "/"
-      if exists("*mkdir")
-          if !isdirectory(directory)
-              call mkdir(directory)
-          endif
-      endif
-      if !isdirectory(directory)
-          echo "Warning: Unable to create backup directory: " . directory
-          echo "Try: mkdir -p " . directory
-      else
-          let directory = substitute(directory, " ", "\\\\ ", "g")
-          exec "set " . settingname . "=" . directory
-      endif
-  endfor
+    let separator = "."
+    let parent = $HOME
+    let prefix = '.vim'
+    let dir_list = {
+                \ 'backup': 'backupdir',
+                \ 'views': 'viewdir',
+                \ 'swap': 'directory' }
+
+    if has('persistent_undo')
+        let dir_list['undo'] = 'undodir'
+    endif
+
+    for [dirname, settingname] in items(dir_list)
+        let directory = parent . '/' . prefix . dirname . "/"
+        if exists("*mkdir")
+            if !isdirectory(directory)
+                call mkdir(directory)
+            endif
+        endif
+        if !isdirectory(directory)
+            echo "Warning: Unable to create backup directory: " . directory
+            echo "Try: mkdir -p " . directory
+        else
+            let directory = substitute(directory, " ", "\\\\ ", "g")
+            exec "set " . settingname . "=" . directory
+        endif
+    endfor
 endfunction
 call InitializeDirectories()
 

README.markdown

@@ -40,7 +40,7 @@ The easiest way to install spf13-vim is to use our [automatic installer](http://
 
 ```bash
 
-    curl http://j.mp/spf13-vim3 -o - | sh
+    curl http://j.mp/spf13-vim3 -L -o - | sh
 
 ```
 
@@ -357,8 +357,8 @@ Here's some tips if you've never used VIM before:
 ## Useful commands
 
 * Use `:q` to exit vim
-* Certain commands are prefixed with a `<Leader>` key, which by default maps to `\`
-  by default. Spf13-vim uses `let mapleader = ","` to change this to `,` which is in a consistent and 
+* Certain commands are prefixed with a `<Leader>` key, which by default maps to `\`.
+  Spf13-vim uses `let mapleader = ","` to change this to `,` which is in a consistent and 
   convenient location.
 * Keyboard [cheat sheet](http://walking-without-crutches.heroku.com/image/images/vi-vim-cheat-sheet.png).
 

bootstrap.sh

@@ -29,10 +29,4 @@ echo "Installing Vundle"
 git clone http://github.com/gmarik/vundle.git $HOME/.vim/bundle/vundle
 
 echo "installing plugins using Vundle"
-vim +BundleInstall! +BundleClean +q
-
-# Build command-t for your system
-echo "building command-t executable\n"
-echo "command-t depends on ruby and rake to be present\n"
-cd $HOME/.vim/bundle/Command-T
-(rake make) || warn "Ruby compilation failed. Ruby, GCC or rake not installed?"
+vim +BundleInstall! +BundleClean +q