patch 7.4.1675

Problem:    The swapmous plugin has to be copied or sourced to be used.
Solution:   Turn it into the swapmouse package.

diff --git a/Filelist b/Filelist
index b64658edde15ed61db495bf09273ac4968b11dd7..65ebe4c4afd6bbd96f0208b8bf41d74939004e08 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -531,6 +531,7 @@ RT_ALL =    \
                runtime/pack/dist/opt/matchit/plugin/matchit.vim \
                runtime/pack/dist/opt/matchit/doc/matchit.txt \
                runtime/pack/dist/opt/matchit/doc/tags \
+               runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
 
 # runtime files for all distributions without CR-NL translation
 RT_ALL_BIN =   \

diff --git a/runtime/macros/README.txt b/runtime/macros/README.txt
index a80500784624a992eede7f5a47b005fea2b2ab8e..a134112aaf5ccb13812abf28cc65323204a6e307 100644 (file)
--- a/runtime/macros/README.txt
+++ b/runtime/macros/README.txt
@@ -15,9 +15,6 @@ less.sh + less.vim    make Vim work like less (or more)
 
 shellmenu.vim          menus for editing shell scripts in the GUI version
 
-swapmous.vim           swap left and right mouse buttons
-
-editexisting.vim       
 
 This one is only for Unix.
 file_select.vim                macros that make a handy file selector
@@ -34,3 +31,5 @@ packadd! editexisting when editing a file that is already edited with
 packadd! justify       justifying text.
 
 packadd! matchit       makes the % command work better
+
+packadd! swapmouse     swap left and right mouse buttons

diff --git a/runtime/macros/swapmous.vim b/runtime/macros/swapmous.vim
index 8b85be050b95a02716966bdb60d5f7004d795a8f..5884d834732853784355a5b676e4675609c983c3 100644 (file)
--- a/runtime/macros/swapmous.vim
+++ b/runtime/macros/swapmous.vim
@@ -1,22 +1,3 @@
-" These macros swap the left and right mouse buttons (for left handed)
-" Don't forget to do ":set mouse=a" or the mouse won't work at all
-noremap         <LeftMouse>    <RightMouse>
-noremap         <2-LeftMouse>  <2-RightMouse>
-noremap         <3-LeftMouse>  <3-RightMouse>
-noremap         <4-LeftMouse>  <4-RightMouse>
-noremap         <LeftDrag>     <RightDrag>
-noremap         <LeftRelease>  <RightRelease>
-noremap         <RightMouse>   <LeftMouse>
-noremap         <2-RightMouse> <2-LeftMouse>
-noremap         <3-RightMouse> <3-LeftMouse>
-noremap         <4-RightMouse> <4-LeftMouse>
-noremap         <RightDrag>    <LeftDrag>
-noremap         <RightRelease> <LeftRelease>
-noremap         g<LeftMouse>   <C-RightMouse>
-noremap         g<RightMouse>  <C-LeftMouse>
-noremap! <LeftMouse>   <RightMouse>
-noremap! <LeftDrag>    <RightDrag>
-noremap! <LeftRelease> <RightRelease>
-noremap! <RightMouse>  <LeftMouse>
-noremap! <RightDrag>   <LeftDrag>
-noremap! <RightRelease>        <LeftRelease>
+" Load the swapmouse package.
+" For those users who were loading the swapmous plugin from here.
+packadd swapmouse

diff --git a/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
new file mode 100644 (file)
index 0000000..8b85be0
--- /dev/null
+++ b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
@@ -0,0 +1,22 @@
+" These macros swap the left and right mouse buttons (for left handed)
+" Don't forget to do ":set mouse=a" or the mouse won't work at all
+noremap         <LeftMouse>    <RightMouse>
+noremap         <2-LeftMouse>  <2-RightMouse>
+noremap         <3-LeftMouse>  <3-RightMouse>
+noremap         <4-LeftMouse>  <4-RightMouse>
+noremap         <LeftDrag>     <RightDrag>
+noremap         <LeftRelease>  <RightRelease>
+noremap         <RightMouse>   <LeftMouse>
+noremap         <2-RightMouse> <2-LeftMouse>
+noremap         <3-RightMouse> <3-LeftMouse>
+noremap         <4-RightMouse> <4-LeftMouse>
+noremap         <RightDrag>    <LeftDrag>
+noremap         <RightRelease> <LeftRelease>
+noremap         g<LeftMouse>   <C-RightMouse>
+noremap         g<RightMouse>  <C-LeftMouse>
+noremap! <LeftMouse>   <RightMouse>
+noremap! <LeftDrag>    <RightDrag>
+noremap! <LeftRelease> <RightRelease>
+noremap! <RightMouse>  <LeftMouse>
+noremap! <RightDrag>   <LeftDrag>
+noremap! <RightRelease>        <LeftRelease>

diff --git a/src/version.c b/src/version.c
index 68991898d3964d28f543d174f1ba3b311f115f1b..70a5969a93b1035d7b86113a62a8a28c1e3ba149 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1675,
 /**/
     1674,
 /**/