summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-01-03 21:02:03 +0000
committerBram Moolenaar <Bram@vim.org>2005-01-03 21:02:03 +0000
commitd7ee7ce2318d5739a325dce2b86eb526d46015f4 (patch)
treeaa51cd784c743659b19e1223649e0932b1f7533e /src
parentf9980f116b6081b0e9e90dac0c2db1c11509f40a (diff)
downloadvim-d7ee7ce2318d5739a325dce2b86eb526d46015f4.zip
updated for version 7.0029
Diffstat (limited to 'src')
-rw-r--r--src/ops.c6
-rw-r--r--src/proto/eval.pro4
-rw-r--r--src/version.h4
3 files changed, 10 insertions, 4 deletions
diff --git a/src/ops.c b/src/ops.c
index b17effe9b..ddc0aab3d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5149,7 +5149,13 @@ write_viminfo_registers(fp)
if (i == TILDE_REGISTER)
continue;
#endif
+ /* Skip empty registers. */
num_lines = y_regs[i].y_size;
+ if (num_lines == 0
+ || (num_lines == 1 && y_regs[i].y_type == MCHAR
+ && STRLEN(y_regs[i].y_array[0]) == 0))
+ continue;
+
if (max_kbyte > 0)
{
/* Skip register if there is more text than the maximum size. */
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 83e10abfc..1cd2f8e05 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -38,8 +38,8 @@ char_u *v_throwpoint __ARGS((char_u *oldval));
char_u *set_cmdarg __ARGS((exarg_T *eap, char_u *oldarg));
char_u *get_var_value __ARGS((char_u *name));
void new_script_vars __ARGS((scid_T id));
-void var_init __ARGS((garray_T *gap));
-void var_clear __ARGS((garray_T *gap));
+void vars_init __ARGS((garray_T *gap));
+void vars_clear __ARGS((garray_T *gap));
void ex_echo __ARGS((exarg_T *eap));
void ex_echohl __ARGS((exarg_T *eap));
void ex_execute __ARGS((exarg_T *eap));
diff --git a/src/version.h b/src/version.h
index 4eaa08a9e..c56ae4986 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Dec 29)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Dec 29, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 3)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 3, compiled "