diff --git a/7.2.350 b/7.2.350 new file mode 100644 index 0000000..7715eb3 --- /dev/null +++ b/7.2.350 @@ -0,0 +1,86 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.350 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.350 +Problem: Win32: When changing font the window may jump from the secondary + to the primary screen. (Michael Wookey) +Solution: When the screen position was negative don't correct it to zero. +Files: src/gui.c + + +*** ../vim-7.2.349/src/gui.c 2009-09-23 18:14:13.000000000 +0200 +--- src/gui.c 2010-01-27 21:02:32.000000000 +0100 +*************** +*** 1390,1395 **** +--- 1390,1396 ---- + int un_maximize = mustset; + int did_adjust = 0; + #endif ++ int x = -1, y = -1; + + if (!gui.shell_created) + return; +*************** +*** 1406,1411 **** +--- 1407,1416 ---- + + base_width = gui_get_base_width(); + base_height = gui_get_base_height(); ++ if (fit_to_display) ++ /* Remember the original window position. */ ++ gui_mch_get_winpos(&x, &y); ++ + #ifdef USE_SUN_WORKSHOP + if (!mustset && usingSunWorkShop + && workshop_get_width_height(&width, &height)) +*************** +*** 1473,1483 **** + + gui_mch_set_shellsize(width, height, min_width, min_height, + base_width, base_height, direction); +- if (fit_to_display) +- { +- int x, y; + +! /* Some window managers put the Vim window left of/above the screen. */ + gui_mch_update(); + if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0)) + gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y); +--- 1478,1489 ---- + + gui_mch_set_shellsize(width, height, min_width, min_height, + base_width, base_height, direction); + +! if (fit_to_display && x >= 0 && y >= 0) +! { +! /* Some window managers put the Vim window left of/above the screen. +! * Only change the position if it wasn't already negative before +! * (happens on MS-Windows with a secondary monitor). */ + gui_mch_update(); + if (gui_mch_get_winpos(&x, &y) == OK && (x < 0 || y < 0)) + gui_mch_set_winpos(x < 0 ? 0 : x, y < 0 ? 0 : y); +*** ../vim-7.2.349/src/version.c 2010-01-27 20:26:41.000000000 +0100 +--- src/version.c 2010-01-27 21:03:41.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 350, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +160. You get in the elevator and double-click the button for the floor + you want. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/README.patches b/README.patches index 4c45241..a9e47c1 100644 --- a/README.patches +++ b/README.patches @@ -346,3 +346,38 @@ Individual patches for Vim 7.2: 3744 7.2.313 command line completion doesn't work after "%:h" and similar 1620 7.2.314 small build broken after 7.2.313 4605 7.2.315 Python libs can't be found on 64 bit system + 3370 7.2.316 may get multiple _FORTIFY_SOURCE arguments + 5249 7.2.317 memory leak when adding a highlight group resulting in E669 + 2637 7.2.318 wrong locale value breaks floating point numbers for gvim + 1846 7.2.319 Motif: accessing freed memory when cancelling font dialog + 6269 7.2.320 unused function in Mzscheme interface + 1899 7.2.321 histadd() and "*" fail to add entry to empty history + 1517 7.2.322 wrong indenting in virtual replace for CTRL-Y and a short line + 2424 7.2.323 (extra) balloon evaluation crashes on Win64 + 1901 7.2.324 a negative column argument in setpos() may cause a crash + 1616 7.2.325 stray "w" in the startup vimrc file makes edited file empty + 1790 7.2.326 Win32: $HOME doesn't work when %HOMEPATH% is not defined + 7899 7.2.327 unused functions in Workshop + 1453 7.2.328 has("win64") does not return 1 on 64 bit MS-Windows version + 1390 7.2.329 cursor pos wrong after "g_" in Visual mode and excl. selection + 45468 7.2.330 tables for Unicode case operators are outdated + 1385 7.2.331 can't interrupt "echo list" for a very long list + 3492 7.2.332 crash if spell correcting triggers autocmd to reload a buffer + 10075 7.2.333 warnings from static code analysis + 9095 7.2.334 postponing keys in Netbeans interface does not work properly + 2802 7.2.335 the CTRL-] command escapes too many characters + 26204 7.2.336 MzScheme interface can't evaluate an expression + 3828 7.2.337 ":compiler" doesn't function properly in a function + 3535 7.2.338 (after 7.2.300) part of FD_CLOEXEC change is missing + 1977 7.2.339 (after 7.2.269) part of --startuptime patch is missing + 1587 7.2.340 gcc warning for condition that can never be true + 2072 7.2.341 popup menu wraps to next line if wide character doesn't fit + 2507 7.2.342 popup menu wrong in 'rightleft' mode with multi-byte chars + 1370 7.2.343 (after 7.2.338) can't compile on Win32 + 1728 7.2.344 (after 7.2.338) can't compile on some systems + 1324 7.2.345 tab line is not updated when the value of 'bt' is changed + 2895 7.2.346 repeating a command with @: causes mapping to be applied twice + 3784 7.2.347 crash when executing mapping redefines that mapping + 7230 7.2.348 (after 7.2.330) Unicode double width table is outdated + 1714 7.2.349 CTRL-W gf puts the new tab in the wrong place + 2766 7.2.350 Win32: When changing font window may jump to another screen diff --git a/vim.spec b/vim.spec index b03c0ea..a57bb1f 100644 --- a/vim.spec +++ b/vim.spec @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 315 +%define patchlevel 350 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -381,6 +381,41 @@ Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312 Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313 Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314 Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315 +Patch316: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.316 +Patch317: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.317 +Patch318: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.318 +Patch319: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.319 +Patch320: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.320 +Patch321: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.321 +Patch322: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.322 +Patch323: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.323 +Patch324: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.324 +Patch325: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.325 +Patch326: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.326 +Patch327: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.327 +Patch328: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.328 +Patch329: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.329 +Patch330: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.330 +Patch331: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.331 +Patch332: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.332 +Patch333: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.333 +Patch334: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.334 +Patch335: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.335 +Patch336: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.336 +Patch337: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.337 +Patch338: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.338 +Patch339: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.339 +Patch340: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.340 +Patch341: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.341 +Patch342: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.342 +Patch343: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.343 +Patch344: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.344 +Patch345: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.345 +Patch346: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.346 +Patch347: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.347 +Patch348: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.348 +Patch349: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.349 +Patch350: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.350 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -834,6 +869,41 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch313 -p0 %patch314 -p0 %patch315 -p0 +%patch316 -p0 +%patch317 -p0 +%patch318 -p0 +%patch319 -p0 +%patch320 -p0 +%patch321 -p0 +%patch322 -p0 +%patch323 -p0 +%patch324 -p0 +%patch325 -p0 +%patch326 -p0 +%patch327 -p0 +%patch328 -p0 +%patch329 -p0 +%patch330 -p0 +%patch331 -p0 +%patch332 -p0 +%patch333 -p0 +%patch334 -p0 +%patch335 -p0 +%patch336 -p0 +%patch337 -p0 +%patch338 -p0 +%patch339 -p0 +%patch340 -p0 +%patch341 -p0 +%patch342 -p0 +%patch343 -p0 +%patch344 -p0 +%patch345 -p0 +%patch346 -p0 +%patch347 -p0 +%patch348 -p0 +%patch349 -p0 +%patch350 -p0 # install spell files @@ -1298,6 +1368,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Jan 28 2010 Karsten Hopp 7.2.350-1 +- patchlevel 350 + * Mon Dec 7 2009 Stepan Kasal - 2:7.2.315-2 - rebuild against perl 5.10.1