$ git diff --patch-with-stat --summary eb82ec602b7f9f5e3365fca3a2b43ccaaefd512f..bbf26fca13e999b31a5c1442184b2dd26eb965b5
.abf.yml | 2 +-
README.omv | 51 ---------------------------------------------
vim-8.1.2292-defaults.patch | 17 +++++++++++++++
vim.spec | 5 +++--
4 files changed, 21 insertions(+), 54 deletions(-)
create mode 100644 vim-8.1.2292-defaults.patch
diff --git a/.abf.yml b/.abf.yml
index 53c715c..d103027 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- v8.1.2292.tar.gz: 27e2cd0cd3f8edb0abfcb6545ba882c33831931c
+ v8.1.2300.tar.gz: cdc8949d19a12f1baed10f697280fcf7bb45dc2b
vim-spec-3.0.bz2: d177f0f3ecb9c93ab15f30a2f99b2ecb1ff08f5d
diff --git a/README.omv b/README.omv
index b05f324..e7379f0 100644
--- a/README.omv
+++ b/README.omv
@@ -50,54 +50,3 @@ where LL is the iso code for your language (eg: vimtutor fr for french users).
The list of availlable languages for tutorial can be retrieved by
looking at /usr/share/vim/tutor/ directory content.
-
-
-
-==============================
-| II Notes for vim packagers |
-==============================
-
-for ease of maintenance, official upstream patches came all together in a
-tarball named vim-x.x.???-patches.tar.xz
-
-the short description of the upstream patches we apply is in
-README.upstream_patches.
-most patches have a "mail context" longer explanation on top of them.
-
-
-A] updating upstream patches :
-==============================
-
-1) look at latest official patch: "make see<ENTER>ls<ENTER>bye"
-
-2) update Makefile variable: N_old should refer current latest official patch
- number and N should refer latest official patch from the ftp site [as seen
- in 1)]
-
-3) retrieve/strip official patches from ftp.vim.org/pub/vim/patches through
- "make"
- this will:
- - download missing patches,
- - convert them to unified format
- - strip the mail signatures from patches in two pass (type <F3> for each
- file in the first pass, then ":x" and then type <F4> for each file in the
- second pass, then ":x")
-
-4) do the tarball with "make tar
- (aka "tar cJf vim-x.x.???-patches{.tar.xz,}")
-
-5) update the spec file so that %official_ptchlvl reflect the new latest patch
- number
-
-
-C] Stripped patches :
-=====================
-
-some patches're only related to some platforms; the unix sources don't contain
-code for others platforms so we've to strip some patches
-
-also, to reduce the patches tarball, we do make strip to remove mail sigs
-
-Here's the list of patches we cutted some parts
-
-- 001 is MS Windows only related
diff --git a/vim-8.1.2292-defaults.patch b/vim-8.1.2292-defaults.patch
new file mode 100644
index 0000000..6d4598f
--- /dev/null
+++ b/vim-8.1.2292-defaults.patch
@@ -0,0 +1,17 @@
+diff -up vim-8.1.2292/runtime/defaults.vim.omv~ vim-8.1.2292/runtime/defaults.vim
+--- vim-8.1.2292/runtime/defaults.vim.omv~ 2019-11-12 15:58:18.572807253 +0100
++++ vim-8.1.2292/runtime/defaults.vim 2019-11-12 16:00:09.318073189 +0100
+@@ -77,7 +77,12 @@ inoremap <C-U> <C-G>u<C-U>
+ " can position the cursor, Visually select and scroll with the mouse.
+ " Only xterm can grab the mouse events when using the shift key, for other
+ " terminals use ":", select text and press Esc.
+-if has('mouse')
++"
++" However, enabling mouse support breaks cut&paste -- arguably the
++" cut&paste functionality provided by konsole and friends is more
++" useful than visually selecting. Let's limit mouse support to the
++" GUI version by default.
++if has('mouse') && has("gui_running")
+ if &term =~ 'xterm'
+ set mouse=a
+ else
diff --git a/vim.spec b/vim.spec
index 48d3fbc..bb9cbbd 100644
--- a/vim.spec
+++ b/vim.spec
@@ -16,14 +16,13 @@
%define longtitle All-purpose text editor
Name: vim
-Version: 8.1.2292
+Version: 8.1.2300
Release: 1
Summary: VIsual editor iMproved
Url: http://www.vim.org/
License: Charityware
Group: Editors
Source0: https://github.com/vim/vim/archive/v%{version}.tar.gz
-# read README.omv prior updating official patches:
Source3: README.omv
# http://vim.sourceforge.net/scripts/script.php?script_id=98
Source5: vim-spec-3.0.bz2
@@ -47,6 +46,7 @@ Source100: vim.rpmlintrc
Patch2: vim-5.6a-paths.patch
#Patch3: vim-7.4.005-rpm-spec-syntax.patch
Patch4: vim-8.1-perl-includes.patch
+Patch5: vim-8.1.2292-defaults.patch
Patch8: vim-6.0af-man-path.patch
Patch10: xxd-locale.patch
Patch20: vimrc_hebrew.patch
@@ -184,6 +184,7 @@ cp -a %{SOURCE12} runtime/colors
%patch2 -p1 -b .p2~
#% patch3 -p1 -b .spec~
%patch4 -p1 -b .perlinc~
+%patch5 -p1 -b .defaults~
%if "%{_libdir}" != "/usr/lib64"
sed -i -e 's,/usr/lib64/perl5/CORE,%{_libdir}/perl5/CORE,g' src/configure.ac
%endif