summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.0370
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2018-12-13 15:11:52 -1000
committerSam Bingner <sam@bingner.com>2018-12-13 15:11:52 -1000
commit957aa75d05c00731d7112bed7b68ce4568667d0c (patch)
tree0445216818495a7864eaa3acde1a1570d34b958d /data/vim/patches/8.1.0370
parentc54a909c8b5a8519130803cf55f68603c0ad3682 (diff)
Update vim
Diffstat (limited to 'data/vim/patches/8.1.0370')
-rw-r--r--data/vim/patches/8.1.037051
1 files changed, 51 insertions, 0 deletions
diff --git a/data/vim/patches/8.1.0370 b/data/vim/patches/8.1.0370
new file mode 100644
index 000000000..463884725
--- /dev/null
+++ b/data/vim/patches/8.1.0370
@@ -0,0 +1,51 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 8.1.0370
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 8.1.0370
+Problem: Not using internal diff if 'diffopt' is not changed.
+Solution: Correct initialization of diff_flags. (Christian Brabandt)
+Files: src/diff.c
+
+
+*** ../vim-8.1.0369/src/diff.c 2018-09-10 17:50:32.713306941 +0200
+--- src/diff.c 2018-09-12 17:56:59.002582092 +0200
+***************
+*** 31,37 ****
+ #define DIFF_VERTICAL 16 // vertical splits
+ #define DIFF_HIDDEN_OFF 32 // diffoff when hidden
+ #define DIFF_INTERNAL 64 // use internal xdiff algorithm
+! static int diff_flags = DIFF_FILLER;
+
+ static long diff_algorithm = 0;
+
+--- 31,37 ----
+ #define DIFF_VERTICAL 16 // vertical splits
+ #define DIFF_HIDDEN_OFF 32 // diffoff when hidden
+ #define DIFF_INTERNAL 64 // use internal xdiff algorithm
+! static int diff_flags = DIFF_INTERNAL | DIFF_FILLER;
+
+ static long diff_algorithm = 0;
+
+*** ../vim-8.1.0369/src/version.c 2018-09-11 22:36:48.129548374 +0200
+--- src/version.c 2018-09-12 17:57:59.986272285 +0200
+***************
+*** 796,797 ****
+--- 796,799 ----
+ { /* Add new patch number below this line */
++ /**/
++ 370,
+ /**/
+
+--
+Seen it all, done it all, can't remember most of it.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///