Merge pull request #442 from pangloss/develop

Develop -> Master

Author: amadeus

README.md

@@ -101,18 +101,6 @@ proposed change and how it is valuable.
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
 
 
-## A Quick Note on Regexes
-
-Vim 7.4 with patches LESS than 1-7 exhibits a bug that broke how we handle
-javascript regexes. Please update to a newer version or run the following
-commands to fix:
-
-```
-:set regexpengine=1
-:syntax enable
-```
-
-
 ## License
 
 Distributed under the same terms as Vim itself. See `:help license`.

ftdetect/javascript.vim

@@ -3,7 +3,7 @@ au BufNewFile,BufRead *.jsm setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
 
 fun! s:SelectJavascript()
-  if getline(1) =~# '^#!.*/bin/env\s\+node\>'
+  if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
     set ft=javascript
   endif
 endfun

ftplugin/javascript.vim

@@ -1 +1,4 @@
 setlocal suffixesadd+=.js
+if (v:version < 704 || (v:version == 704 && !has('patch002'))) && exists('&regexpengine')
+  set re=1
+end