summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-01-14 12:33:36 +0100
committerBram Moolenaar <Bram@vim.org>2014-01-14 12:33:36 +0100
commit32b9201f3726b26d1b5a558f95919cf0575a4b78 (patch)
tree81839de26ce0fcb0cc99c756b5df781c140757bf
parent9d1685d1cf21cf5c17a52ae8ea143161a0d00d37 (diff)
updated for version 7.4.145v7.4.145
Problem: getregtype() does not return zero for unknown register. Solution: Adjust documention: return empty string for unknown register. Check the register name to be valid. (Yukihiro Nakadaira)
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index be0e667b7c..f8f3b99bcc 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3460,7 +3460,7 @@ getregtype([{regname}]) *getregtype()*
"v" for |characterwise| text
"V" for |linewise| text
"<CTRL-V>{width}" for |blockwise-visual| text
- 0 for an empty or unknown register
+ "" for an empty or unknown register
<CTRL-V> is one character with value 0x16.
If {regname} is not specified, |v:register| is used.
diff --git a/src/ops.c b/src/ops.c
index d2060a47e8..66b9b59496 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -6240,7 +6240,9 @@ get_reg_type(regname, reglen)
regname = may_get_selection(regname);
#endif
- /* Should we check for a valid name? */
+ if (regname != NUL && !valid_yank_reg(regname, FALSE))
+ return MAUTO;
+
get_yank_register(regname, FALSE);
if (y_current->y_array != NULL)
diff --git a/src/version.c b/src/version.c
index 8ecdef609e..ed8a10adba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 145,
+/**/
144,
/**/
143,