summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-02-20 19:11:07 +0000
committerBram Moolenaar <Bram@vim.org>2008-02-20 19:11:07 +0000
commit18081e3c4ea6291b549bff3a17f54d3162c3f278 (patch)
tree750578e9761fc44974185d0c32c95c1a635006ce
parentffd82c530766c02f76cbdd9db80adb853859e10b (diff)
downloadvim-git-18081e3c4ea6291b549bff3a17f54d3162c3f278.tar.gz
updated for version 7.1-262v7.1.262
-rw-r--r--runtime/doc/eval.txt7
-rw-r--r--src/eval.c14
-rw-r--r--src/version.c2
3 files changed, 22 insertions, 1 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 7acf740ed..13caa16cf 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.1. Last change: 2008 Feb 13
+*eval.txt* For Vim version 7.1. Last change: 2008 Feb 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1638,6 +1638,7 @@ getline( {lnum}) String line {lnum} of current buffer
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,6 +3834,10 @@ nr2char({expr}) *nr2char()*
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()|.
diff --git a/src/eval.c b/src/eval.c
index 0dd8bd0b7..bcf9b79d9 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -532,6 +532,7 @@ static void f_getftime __ARGS((typval_T *argvars, typval_T *rettv));
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,6 +7133,7 @@ static struct fst
{"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},
@@ -10374,6 +10376,18 @@ f_getmatches(argvars, rettv)
}
/*
+ * "getpid()" function
+ */
+/*ARGSUSED*/
+ static void
+f_getpid(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ rettv->vval.v_number = mch_get_pid();
+}
+
+/*
* "getpos(string)" function
*/
static void
diff --git a/src/version.c b/src/version.c
index fd5901449..269153ed9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 262,
+/**/
261,
/**/
260,