From 3cd8dbcb807b44dcfe10bdff0e52f7378459a1eb Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 02 2010 23:09:55 +0000 Subject: - patchlevel 385 --- diff --git a/7.2.385 b/7.2.385 new file mode 100644 index 0000000..9f9a917 --- /dev/null +++ b/7.2.385 @@ -0,0 +1,63 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.385 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.385 +Problem: When in the command line window dragging status line only works + for last-but-one window. (Jean Johner) +Solution: Remove the code that disallows this. +Files: src/ui.c + + +*** ../vim-7.2.384/src/ui.c 2010-01-19 14:59:14.000000000 +0100 +--- src/ui.c 2010-03-02 18:06:30.000000000 +0100 +*************** +*** 2598,2611 **** + if (cmdwin_type != 0 && wp != curwin) + { + /* A click outside the command-line window: Use modeless +! * selection if possible. Allow dragging the status line of +! * windows just above the command-line window. */ +! if (wp->w_winrow + wp->w_height +! != curwin->w_prev->w_winrow + curwin->w_prev->w_height) +! { +! on_status_line = 0; +! dragwin = NULL; +! } + # ifdef FEAT_VERTSPLIT + on_sep_line = 0; + # endif +--- 2598,2604 ---- + if (cmdwin_type != 0 && wp != curwin) + { + /* A click outside the command-line window: Use modeless +! * selection if possible. Allow dragging the status lines. */ + # ifdef FEAT_VERTSPLIT + on_sep_line = 0; + # endif +*** ../vim-7.2.384/src/version.c 2010-03-02 17:59:39.000000000 +0100 +--- src/version.c 2010-03-02 18:14:29.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 385, + /**/ + +-- +You were lucky. We lived for three months in a brown paper bag in a +septic tank. We used to have to get up at six o'clock in the morning, +clean the bag, eat a crust of stale bread, go to work down mill for +fourteen hours a day week in-week out. When we got home, our Dad +would thrash us to sleep with his belt! + + /// 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 be868bc..ab0206b 100644 --- a/README.patches +++ b/README.patches @@ -415,3 +415,4 @@ Individual patches for Vim 7.2: 1766 7.2.382 close cmdline window when 'bufhide' is "wipe" uses freed mem 3021 7.2.383 Vim doesn't build cleanly with MSVC 2010 1849 7.2.384 (extra) Vim doesn't build properly with MSVC 2010 + 2147 7.2.385 can't drag status line when in the command line window diff --git a/vim.spec b/vim.spec index 142125e..b20b8b5 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 384 +%define patchlevel 385 Summary: The VIM editor URL: http://www.vim.org/ @@ -450,6 +450,7 @@ Patch381: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.381 Patch382: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.382 Patch383: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.383 Patch384: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.384 +Patch385: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.385 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -972,6 +973,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch382 -p0 %patch383 -p0 %patch384 -p0 +%patch385 -p0 # install spell files @@ -1436,6 +1438,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Mar 03 2010 Karsten Hopp 7.2.385-1 +- patchlevel 385 + * Tue Mar 02 2010 Karsten Hopp 7.2.384-1 - patchlevel 384