updated for version 7.0029
diff --git a/src/ops.c b/src/ops.c
index b17effe..ddc0aab 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5149,7 +5149,13 @@
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 83e10ab..1cd2f8e 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -38,8 +38,8 @@
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 4eaa08a..c56ae49 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 "