diff --git a/7.1.262 b/7.1.262 new file mode 100644 index 0000000..8b2111d --- /dev/null +++ b/7.1.262 @@ -0,0 +1,111 @@ +To: vim-dev@vim.org +Subject: Patch 7.1.262 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.1.262 +Problem: Can't get the process ID of Vim. +Solution: Implement getpid(). +Files: src/eval.c, runtime/doc/eval.txt + + +*** ../vim-7.1.261/src/eval.c Wed Feb 20 12:22:59 2008 +--- src/eval.c Wed Feb 20 11:08:21 2008 +*************** +*** 532,537 **** +--- 532,538 ---- + static void f_getftype __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_getline __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_getmatches __ARGS((typval_T *argvars, typval_T *rettv)); ++ static void f_getpid __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_getpos __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_getqflist __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_getreg __ARGS((typval_T *argvars, typval_T *rettv)); +*************** +*** 7132,7137 **** +--- 7133,7139 ---- + {"getline", 1, 2, f_getline}, + {"getloclist", 1, 1, f_getqflist}, + {"getmatches", 0, 0, f_getmatches}, ++ {"getpid", 0, 0, f_getpid}, + {"getpos", 1, 1, f_getpos}, + {"getqflist", 0, 0, f_getqflist}, + {"getreg", 0, 2, f_getreg}, +*************** +*** 10371,10376 **** +--- 10373,10390 ---- + } + } + #endif ++ } ++ ++ /* ++ * "getpid()" function ++ */ ++ /*ARGSUSED*/ ++ static void ++ f_getpid(argvars, rettv) ++ typval_T *argvars; ++ typval_T *rettv; ++ { ++ rettv->vval.v_number = mch_get_pid(); + } + + /* +*** ../vim-7.1.261/runtime/doc/eval.txt Wed Feb 13 12:41:30 2008 +--- runtime/doc/eval.txt Wed Feb 20 11:10:17 2008 +*************** +*** 1,4 **** +! *eval.txt* For Vim version 7.1. Last change: 2008 Feb 13 + + + VIM REFERENCE MANUAL by Bram Moolenaar +--- 1,4 ---- +! *eval.txt* For Vim version 7.1. Last change: 2008 Feb 20 + + + VIM REFERENCE MANUAL by Bram Moolenaar +*************** +*** 1638,1643 **** +--- 1638,1644 ---- + getline( {lnum}, {end}) List lines {lnum} to {end} of current buffer + getloclist({nr}) List list of location list items + getmatches() List list of current matches ++ getpid() Number process ID of Vim + getpos( {expr}) List position of cursor, mark, etc. + getqflist() List list of quickfix items + getreg( [{regname} [, 1]]) String contents of register +*************** +*** 3833,3838 **** +--- 3837,3846 ---- + characters. nr2char(0) is a real NUL and terminates the + string, thus results in an empty string. + ++ *getpid()* ++ getpid() Return a Number which is the process ID of the Vim process. ++ On Unix this is a unique number. On MS-DOS it's always zero. ++ + *getpos()* + getpos({expr}) Get the position for {expr}. For possible values of {expr} + see |line()|. +*** ../vim-7.1.261/src/version.c Wed Feb 20 18:14:25 2008 +--- src/version.c Wed Feb 20 20:04:14 2008 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 262, + /**/ + +-- +Those who live by the sword get shot by those who don't. + + /// 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 159f3bb..48e2eb8 100644 --- a/README.patches +++ b/README.patches @@ -277,3 +277,20 @@ Individual patches for Vim 7.1: 4475 7.1.243 (after 7.1.240) "U" doesn't work on all text in Visual mode 1847 7.1.244 GUI may have part of the command line cut off 2767 7.1.245 pressing CTRL-\ three times causes Vim to quit + 2739 7.1.246 configure hangs when the man pager is something strange + 6028 7.1.247 Netbeans: backspacing in Insert mode may skip a character + 3691 7.1.248 can't set the '" mark; can't know if setpos() was successful + 2144 7.1.249 after "U" the cursor can be past end of line + 1684 7.1.250 error for ":setglobal fenc=anything" when 'modifiable' is off + 3134 7.1.251 accessing freed memory when spell checking enabled + 1399 7.1.252 (after 7.1.243) test 39 fails when locale uses utf-8 encoding + 1751 7.1.253 ":sort" doesn't work in a one line file + 1894 7.1.254 Tests 49 and 55 fail when the locale is French + 1514 7.1.255 Vim doesn't support utf-32 + 50921 7.1.256 findfile() also returns directories + 3326 7.1.257 configure can't always find the Tcl header files + 3360 7.1.258 crash when doing "d/\n/e" and 'virtualedit' is "all" + 1944 7.1.259 cursor in wrong place with 'rl', "utf-8" and illegal byte + 1805 7.1.260 cursor position wrong after ^@ wrapping halfway if using utf-8 + 2255 7.1.261 for a 2 byte BOM UCS-2 is used, which doesn't work for UTF-16 + 3438 7.1.262 can't get the process ID of Vim diff --git a/vim.spec b/vim.spec index 62900a3..ec61337 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 245 +%define patchlevel 262 Summary: The VIM editor URL: http://www.vim.org/ @@ -295,6 +295,27 @@ Patch239: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.239 Patch240: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.240 Patch241: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.241 Patch242: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.242 +Patch243: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.241 +Patch244: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.243 +Patch244: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.244 +Patch245: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.245 +Patch246: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.246 +Patch247: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.247 +Patch248: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.248 +Patch249: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.249 +Patch250: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.250 +Patch251: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.251 +Patch252: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.252 +Patch253: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.253 +Patch254: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.254 +Patch255: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.255 +Patch256: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.256 +Patch257: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.257 +Patch258: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.258 +Patch259: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.259 +Patch260: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.260 +Patch261: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.261 +Patch262: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.262 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -671,6 +692,26 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch240 -p0 %patch241 -p0 %patch242 -p0 +%patch243 -p0 +%patch244 -p0 +%patch245 -p0 +%patch246 -p0 +%patch247 -p0 +%patch248 -p0 +%patch249 -p0 +%patch250 -p0 +%patch251 -p0 +%patch252 -p0 +%patch253 -p0 +%patch254 -p0 +%patch255 -p0 +%patch256 -p0 +%patch257 -p0 +%patch258 -p0 +%patch259 -p0 +%patch260 -p0 +%patch261 -p0 +%patch262 -p0 # install spell files @@ -1058,6 +1099,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Feb 25 2008 Karsten Hopp 7.1.262-1 +- patchlevel 262 +- add fix for #231124, BOM was ignored + * Mon Feb 11 2008 Karsten Hopp 7.1.245-1 - patchlevel 245