patchlevel 347

1405234 - Gvim fails to properly render after Openbox desktop switch
This commit is contained in:
Zdenek Dohnal 2017-02-22 17:24:23 +01:00
commit 23a5eac2ef
5 changed files with 70 additions and 3 deletions

1
.gitignore vendored
View File

@ -37,3 +37,4 @@
/vim-8.0-329.tar.bz2
/vim-8.0-342.tar.bz2
/vim-8.0-344.tar.bz2
/vim-8.0-347.tar.bz2

View File

@ -1,3 +1,32 @@
commit d099e033703ce0772f152b8df8a763f0b65303ee
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 21 23:00:36 2017 +0100
patch 8.0.0347: when using completion comment leader wont work
Problem: When using CTRL-X CTRL-U inside a comment, the use of the comment
leader may not work. (Klement)
Solution: Save and restore did_ai. (Christian Brabandt, closes #1494)
commit bfd30590f6e3475033099d0fb20d9444fa10af6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 21 21:57:06 2017 +0100
patch 8.0.0346: Vim relies on limits.h to be included indirectly
Problem: Vim relies on limits.h to be included indirectly, but on Solaris 9
it may not be. (Ben Fritz)
Solution: Always include limits.h.
commit 3a257737726ba42980bf38ec9a0c80944756af24
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 21 20:47:13 2017 +0100
patch 8.0.0345: islocked('d.changedtick') does not work
Problem: islocked('d.changedtick') does not work.
Solution: Make it work.
commit 49439c4cdf7d2822255f292adda4226656fe144d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 20 23:07:05 2017 +0100

View File

@ -1 +1 @@
SHA512 (vim-8.0-344.tar.bz2) = 6216bcbaf5a7dbdaacf1fbe0c264ce2c109bfe7da32ce0612e2121bcf143128d7681cc53decdc81de43bb66485b639cada339cda519c0d398803a9b2dfe244fc
SHA512 (vim-8.0-347.tar.bz2) = 2e1cc927c154db7a3200cf8b0ba3f2b7054ed971dd438efa1e157260d646b52e895f721b5ebe056e81c90e8299b74a7db58a2e3af7286150636748fcbbc0492d

31
vim-8.0-gtk3-render.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up vim80/src/gui_gtk_x11.c.gtk3-render vim80/src/gui_gtk_x11.c
--- vim80/src/gui_gtk_x11.c.gtk3-render 2017-02-22 10:38:37.935193240 +0100
+++ vim80/src/gui_gtk_x11.c 2017-02-22 10:53:22.847435530 +0100
@@ -688,8 +688,13 @@ draw_event(GtkWidget *widget UNUSED,
{
const cairo_rectangle_t rect = list->rectangles[i];
- gui_mch_clear_block(Y_2_ROW(rect.y), 1,
- Y_2_ROW(rect.y + rect.height - 1), Columns);
+ gui_mch_clear_block(Y_2_ROW((int)rect.y), 0,
+ Y_2_ROW((int)(rect.y + rect.height)) - 1, Columns - 1);
+ }
+
+ for (i = 0; i < list->num_rectangles; i++)
+ {
+ const cairo_rectangle_t rect = list->rectangles[i];
if (blink_mode)
gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height);
@@ -6723,6 +6728,11 @@ gui_mch_clear_block(int row1, int col1,
color.pixel = gui.back_pixel;
#endif
+ col1 = check_col(col1);
+ col2 = check_col(col2);
+ row1 = check_row(row1);
+ row2 = check_row(row2);
+
#if GTK_CHECK_VERSION(3,0,0)
{
/* Add one pixel to the far right column in case a double-stroked

View File

@ -1,4 +1,4 @@
%define patchlevel 344
%define patchlevel 347
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
%define WITH_SELINUX 1
%endif
@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/
Name: vim
Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist}
Release: 2%{?dist}
License: Vim
Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@ -65,6 +65,7 @@ Patch3013: vim-7.4-globalsyntax.patch
Patch3014: vim-7.4-releasestring-1318991.patch
Patch3015: vim-8.0-rhbz1365258.patch
Patch3016: vim-8.0-copy-paste.patch
Patch3017: vim-8.0-gtk3-render.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@ -220,6 +221,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3014 -p1
%patch3015 -p1
%patch3016 -p1
%patch3017 -p1
%build
cp -f %{SOURCE6} .
@ -765,6 +767,10 @@ rm -rf %{buildroot}
%{_datadir}/icons/locolor/*/apps/*
%changelog
* Wed Feb 22 2017 Karsten Hopp <karsten@redhat.com> 8.0.347-2
- patchlevel 347
- 1405234 - Gvim fails to properly render after Openbox desktop switch
* Tue Feb 21 2017 Karsten Hopp <karsten@redhat.com> 8.0.344-1
- patchlevel 344