From 79007a2aaf0c202a2dc17b264e79b5f15d83efc9 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 11 2010 17:06:49 +0000 Subject: - patchlevel 357 --- diff --git a/7.2.357 b/7.2.357 new file mode 100644 index 0000000..e1998a8 --- /dev/null +++ b/7.2.357 @@ -0,0 +1,49 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.357 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.357 +Problem: When changing 'fileformat' from/to "mac" and there is a CR in the + text the display is wrong. +Solution: Redraw the text when 'fileformat' is changed. (Ben Schmidt) +Files: src/option.c + + +*** ../vim-7.2.356/src/option.c 2010-01-27 15:57:17.000000000 +0100 +--- src/option.c 2010-02-11 16:57:19.000000000 +0100 +*************** +*** 5867,5872 **** +--- 5867,5876 ---- + #endif + /* update flag in swap file */ + ml_setflags(curbuf); ++ /* Redraw needed when switching to/from "mac": a CR in the text ++ * will be displayed differently. */ ++ if (get_fileformat(curbuf) == EOL_MAC || *oldval == 'm') ++ redraw_curbuf_later(NOT_VALID); + } + } + +*** ../vim-7.2.356/src/version.c 2010-02-03 18:14:41.000000000 +0100 +--- src/version.c 2010-02-11 17:01:36.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 357, + /**/ + +-- +From the classified section of a city newspaper: +Dog for sale: eats anything and is fond of children. + + /// 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 d3f63dd..ad29ee0 100644 --- a/README.patches +++ b/README.patches @@ -387,3 +387,4 @@ Individual patches for Vim 7.2: 2270 7.2.354 Japanese single-width double-byte chars not handled correctly 2663 7.2.355 popup menu in wrong position when 'number' is set 2166 7.2.356 not all folds are closed when 'foldmethod' is changed + 1565 7.2.357 CR displayed wrong when changing 'fileformat' from/to "mac" diff --git a/vim.spec b/vim.spec index 939dffd..f2e1fd9 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 356 +%define patchlevel 357 Summary: The VIM editor URL: http://www.vim.org/ @@ -422,6 +422,7 @@ Patch353: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.353 Patch354: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.354 Patch355: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.355 Patch356: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.356 +Patch357: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.357 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -916,6 +917,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch354 -p0 %patch355 -p0 %patch356 -p0 +%patch357 -p0 # install spell files @@ -1380,6 +1382,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Feb 11 2010 Karsten Hopp 7.2.357-1 +- patchlevel 357 + * Thu Feb 04 2010 Karsten Hopp 7.2.356-1 - patchlevel 356