1
0
Эх сурвалжийг харах

Bump Vim version a bit more to 7.4.143.

Reason:

  A fix has been applied to bring back triggering of TextChangedI events.

- https://github.com/vim/vim/commit/e21b6b2a8d526f22ece5ccadafa3a6ff3289d603
Francisco Lopes 9 жил өмнө
parent
commit
5576c9cf09

+ 11 - 9
README.md

@@ -210,7 +210,7 @@ that are conservatively turned off by default that you may want to turn on.
 Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you.
 
-Make sure you have Vim 7.4 with python2 or python3 support. Ubuntu 14.04 and
+Make sure you have Vim 7.4.143 with python2 or python3 support. Ubuntu 14.04 and
 later have a Vim that's recent enough. You can see the version of Vim installed
 by running `vim --version`. If the version is too old, you may need to [compile
 Vim from source][vim-build] (don't worry, it's easy).
@@ -272,7 +272,7 @@ that are conservatively turned off by default that you may want to turn on.
 Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you.
 
-Make sure you have Vim 7.4 with Python 2 or Python 3 support. Fedora 21 and
+Make sure you have Vim 7.4.143 with Python 2 or Python 3 support. Fedora 21 and
 later have a Vim that's recent enough. You can see the version of Vim installed
 by running `vim --version`. If the version is too old, you may need to [compile
 Vim from source][vim-build] (don't worry, it's easy).
@@ -337,7 +337,7 @@ provided on a best-effort basis and may not work for you.
 **Important:** we assume that you are using the `cmd.exe` command prompt and
 that you know how to add an executable to the PATH environment variable.
 
-Make sure you have at least Vim 7.4 with Python 2 or Python 3 support. You
+Make sure you have at least Vim 7.4.143 with Python 2 or Python 3 support. You
 can check the version and which Python is supported by typing `:version` inside
 Vim. Look at the features included: `+python/dyn` for Python 2 and
 `+python3/dyn` for Python 3. Take note of the Vim architecture, i.e. 32 or
@@ -414,7 +414,7 @@ Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you. OpenBSD / FreeBSD are
 not officially supported platforms by YCM.
 
-Make sure you have Vim 7.4 with Python 2 or Python 3 support.
+Make sure you have Vim 7.4.143 with Python 2 or Python 3 support.
 
 OpenBSD 5.5 and later have a Vim that's recent enough. You can see the version of
 Vim installed by running `vim --version`.
@@ -491,17 +491,19 @@ process.
 
 **Please follow the instructions carefully. Read EVERY WORD.**
 
-1.  **Ensure that your version of Vim is _at least_ 7.4 _and_ that it has
+1.  **Ensure that your version of Vim is _at least_ 7.4.143 _and_ that it has
     support for Python 2 or Python 3 scripting**.
 
     Inside Vim, type `:version`. Look at the first two to three lines of output;
     it should say `Vi IMproved X.Y`, where X.Y is the major version of vim. If
-    your version is greater than or equal 7.4, then you're all set.
+    your version is greater than 7.4, then you're all set. If your version is
+    7.4 then look below that where it says, `Included patches: 1-Z`, where Z
+    will be some number. That number needs to be 143 or higher.
 
     If your version of Vim is not recent enough, you may need to [compile Vim
     from source][vim-build] (don't worry, it's easy).
 
-    After you have made sure that you have Vim 7.4+, type the following in
+    After you have made sure that you have Vim 7.4.143+, type the following in
     Vim: `:echo has('python') || has('python3')`. The output should be 1. If
     it's 0, then get a version of Vim with Python support.
 
@@ -2678,8 +2680,8 @@ fixed, Vim trunk landed the `pyeval()` function which improved YCM performance
 even more since less time was spent serializing and deserializing data between
 Vim and the embedded Python interpreter. A few critical bugfixes for `pyeval()`
 landed in Vim 7.3.584 (and a few commits before that), and given the current
-availability of Vim 7.4, which packs improved events for text change detection,
-it has been chosen.
+availability of Vim 7.4.143, which packs improved events for text change
+detection, it has been chosen.
 
 ### I get annoying messages in Vim's status area when I type
 

+ 10 - 8
doc/youcompleteme.txt

@@ -405,7 +405,7 @@ Ubuntu Linux x64 ~
 Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you.
 
-Make sure you have Vim 7.4 with python2 or python3 support. Ubuntu 14.04
+Make sure you have Vim 7.4.143 with python2 or python3 support. Ubuntu 14.04
 and later have a Vim that's recent enough. You can see the version of Vim
 installed by running 'vim --version'. If the version is too old, you may need
 to compile Vim from source [26] (don't worry, it's easy).
@@ -473,7 +473,7 @@ Fedora Linux x64 ~
 Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you.
 
-Make sure you have Vim 7.4 with Python 2 or Python 3 support. Fedora 21 and
+Make sure you have Vim 7.4.143 with Python 2 or Python 3 support. Fedora 21 and
 later have a Vim that's recent enough. You can see the version of Vim installed
 by running 'vim --version'. If the version is too old, you may need to compile
 Vim from source [26] (don't worry, it's easy).
@@ -544,7 +544,7 @@ provided on a best-effort basis and may not work for you.
 **Important:** we assume that you are using the 'cmd.exe' command prompt and
 that you know how to add an executable to the PATH environment variable.
 
-Make sure you have at least Vim 7.4 with Python 2 or Python 3 support. You
+Make sure you have at least Vim 7.4.143 with Python 2 or Python 3 support. You
 can check the version and which Python is supported by typing ':version' inside
 Vim. Look at the features included: '+python/dyn' for Python 2 and
 '+python3/dyn' for Python 3. Take note of the Vim architecture, i.e. 32 or
@@ -627,7 +627,7 @@ Please refer to the full Installation Guide below; the following commands are
 provided on a best-effort basis and may not work for you. OpenBSD / FreeBSD are
 not officially supported platforms by YCM.
 
-Make sure you have Vim 7.4 with Python 2 or Python 3 support.
+Make sure you have Vim 7.4.143 with Python 2 or Python 3 support.
 
 OpenBSD 5.5 and later have a Vim that's recent enough. You can see the version
 of Vim installed by running 'vim --version'.
@@ -708,17 +708,19 @@ will notify you to recompile it. You should then rerun the install process.
 
 **Please follow the instructions carefully. Read EVERY WORD.**
 
-1. **Ensure that your version of Vim is _at least_ 7.4 _and_ that it has
+1. **Ensure that your version of Vim is _at least_ 7.4.143 _and_ that it has
    support for Python 2 or Python 3 scripting**.
 
    Inside Vim, type ':version'. Look at the first two to three lines of
    output; it should say 'Vi IMproved X.Y', where X.Y is the major version
-   of vim. If your version is greater than 7.4, then you're all set.
+   of vim. If your version is greater than 7.4, then you're all set. If your
+   version is 7.4 then look below that where it says, 'Included patches:
+   1-Z', where Z will be some number. That number needs to be 143 or higher.
 
    If your version of Vim is not recent enough, you may need to compile Vim
    from source [26] (don't worry, it's easy).
 
-   After you have made sure that you have Vim 7.4+, type the following
+   After you have made sure that you have Vim 7.4.143+, type the following
    in Vim: ":echo has('python') || has('python3')". The output should be 1.
    If it's 0, then get a version of Vim with Python support.
 
@@ -2938,7 +2940,7 @@ were fixed, Vim trunk landed the 'pyeval()' function which improved YCM
 performance even more since less time was spent serializing and deserializing
 data between Vim and the embedded Python interpreter. A few critical bugfixes
 for 'pyeval()' landed in Vim 7.3.584 (and a few commits before that), and given
-the current availability of Vim 7.4, which packs improved events for text
+the current availability of Vim 7.4.143, which packs improved events for text
 change detection, it has been chosen.
 
 -------------------------------------------------------------------------------

+ 2 - 2
plugin/youcompleteme.vim

@@ -27,9 +27,9 @@ endfunction
 if exists( "g:loaded_youcompleteme" )
   call s:restore_cpo()
   finish
-elseif v:version < 704
+elseif v:version < 704 || (v:version == 704 && !has('patch143'))
   echohl WarningMsg |
-        \ echomsg "YouCompleteMe unavailable: requires Vim 7.4+" |
+        \ echomsg "YouCompleteMe unavailable: requires Vim 7.4.143+" |
         \ echohl None
   call s:restore_cpo()
   finish