Merge remote-tracking branch 'source/master' into develop

amadeus · amadeus · commit a08e6cc335bb · 2014-02-09T17:30:53.000-08:00
diff --git a/README.md b/README.md
@@ -2,9 +2,27 @@
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
+## A Quick Note on Regexes
+
+Vim 7.4 was released recently, and unfortunately broke how this plugin
+handles regexes. There was no real easy way for us to fix this unless we
+completely rewrote how regexes work.
+
+Good News: There was a recent update to Vim 7.4 that fixes this issue.
+
+Make sure you are at least using Vim 7.4, with patches 1-7.
+
+If you are stuck on an older version of Vim 7.4 with no way to update,
+then simply perform the following commands to fix your current buffer:
+
+```
+:set regexpengine=1
+:syntax enable
+```
+
 ## Installation
 
-- Install with [Vundle](https://github.com/gmarik/vundle)
+### Install with [Vundle](https://github.com/gmarik/vundle)
 
 Add to vimrc:
 
@@ -15,10 +33,10 @@ And install it:
     :so ~/.vimrc
     :BundleInstall
 
-- Install with [pathogen](https://github.com/tpope/vim-pathogen)
+### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
-    cd ~/.vim/bundle
-    git clone https://github.com/pangloss/vim-javascript.git
+      cd ~/.vim/bundle
+      git clone https://github.com/pangloss/vim-javascript.git
 
 ## Configuration
 
diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
@@ -1,6 +1,5 @@
 au BufNewFile,BufRead *.js setf javascript
 au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead *.json setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
 
 fun! s:SelectJavascript()
