patch 9.1.1768: Makefile does not uninstall global plugins

Problem:  Makefile does not uninstall global plugins
          (after v9.1.1757)
Solution: Uninstall global plugins before installing them,
          so that old files are not carried around and loaded
          when no longer used.

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index d1b08be257d01757287d5bfa3a7fd77637fdb35e..333a9121cd79454af73964f586c43012f9a145e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2474,7 +2474,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
 # install the standard import files
        cd $(IMPORTSOURCE)/dist; $(INSTALL_DATA) *.vim $(DEST_IMPORT)/dist
        cd $(DEST_IMPORT)/dist; chmod $(HELPMOD) *.vim
-# install the standard plugin files
+# install the standard plugin files, but first remove existing ones
+       -rm -f $(DEST_PLUG)/*.vim
        cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
        cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
 # install the ftplugin files

diff --git a/src/version.c b/src/version.c
index ea120ceaf0a2b15d07d88e8b950891226c58f15d..b7531bd14abb73e5813625ff15f850ff80e83134 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1768,
 /**/
     1767,
 /**/