From 36ef464a2accb665e63226cecc92b94f92ed0c88 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 12 2008 12:38:47 +0000 Subject: - patchlevel 273 --- diff --git a/7.1.273 b/7.1.273 new file mode 100644 index 0000000..02a6ca9 --- /dev/null +++ b/7.1.273 @@ -0,0 +1,74 @@ +To: vim-dev@vim.org +Subject: Patch 7.1.273 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.1.273 +Problem: When profiling on Linux Vim exits early. (Liu Yubao) +Solution: When profiling don't exit on SIGPROF. +Files: src/Makefile, src/os_unix.c + + +*** ../vim-7.1.272/src/Makefile Wed Mar 12 12:23:18 2008 +--- src/Makefile Wed Mar 12 13:11:07 2008 +*************** +*** 545,551 **** + # For unknown reasons adding "-lc" fixes a linking problem with GCC. That's + # probably a bug in the "-pg" implementation. + # Need to recompile everything after changing this: "make clean" "make". +! #PROFILE_CFLAGS = -pg -g + #PROFILE_LIBS = -pg + #PROFILE_LIBS = -pg -lc + +--- 545,551 ---- + # For unknown reasons adding "-lc" fixes a linking problem with GCC. That's + # probably a bug in the "-pg" implementation. + # Need to recompile everything after changing this: "make clean" "make". +! #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING + #PROFILE_LIBS = -pg + #PROFILE_LIBS = -pg -lc + +*** ../vim-7.1.272/src/os_unix.c Sun Feb 10 22:25:12 2008 +--- src/os_unix.c Wed Mar 5 22:15:41 2008 +*************** +*** 269,276 **** + #ifdef SIGVTALRM + {SIGVTALRM, "VTALRM", TRUE}, + #endif +! #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) +! /* MzScheme uses SIGPROF for its own needs */ + {SIGPROF, "PROF", TRUE}, + #endif + #ifdef SIGXCPU +--- 269,277 ---- + #ifdef SIGVTALRM + {SIGVTALRM, "VTALRM", TRUE}, + #endif +! #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) +! /* MzScheme uses SIGPROF for its own needs; On Linux with profiling +! * this makes Vim exit. WE_ARE_PROFILING is defined in Makefile. */ + {SIGPROF, "PROF", TRUE}, + #endif + #ifdef SIGXCPU +*** ../vim-7.1.272/src/version.c Wed Mar 12 12:22:56 2008 +--- src/version.c Wed Mar 12 13:08:59 2008 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 273, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...". + + /// 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 a2910de..a62b12c 100644 --- a/README.patches +++ b/README.patches @@ -302,3 +302,6 @@ Individual patches for Vim 7.1: 1576 7.1.268 always shows "+" at end of screen line with 'cursurline' 6183 7.1.269 matchparen plugin has an arbitrary line number limit 2861 7.1.270 ":?foo?" matches in current line since patch 7.1.025 + 1582 7.1.271 in tiny version ":!touch %" causes curbuf to be wrong + 2334 7.1.272 buffer name [Location List] not used for buffer in other tab + 2504 7.1.273 when profiling on Linux Vim exits early diff --git a/vim.spec b/vim.spec index 5617e31..3d2921c 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 270 +%define patchlevel 273 Summary: The VIM editor URL: http://www.vim.org/ @@ -325,6 +325,9 @@ Patch267: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.267 Patch268: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.268 Patch269: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.269 Patch270: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.270 +Patch271: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.271 +Patch272: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.272 +Patch273: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.273 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -731,6 +734,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch268 -p0 %patch269 -p0 %patch270 -p0 +%patch271 -p0 +%patch272 -p0 +%patch273 -p0 # install spell files @@ -1135,6 +1141,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Mar 12 2008 Karsten Hopp 7.1.273-1 +- update to patchlevel 273, this fixes #436902 + * Tue Mar 11 2008 Karsten Hopp 7.1.270-1 - patchlevel 270 - don't write swapfile on most common locations for USB-sticks (#436752)