commit 3b3a9498d1eab3c28c524cce115160528a9a9297
author Bram Moolenaar <Bram@vim.org> Tue Jan 27 18:44:16 2015 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Jan 27 18:44:16 2015 +0100
tree 60edbd96e70b18901cf68760a971f191d590c47c
parent 6bf7c523ad54f625547ef2cc6009c28c0dd337ed

updated for version 7.4.605
Problem:    The # register is not writable, it cannot be restored after
            jumping around.
Solution:   Make the # register writable. (Marcin Szamotulski)

src/buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 0d14706..e4230fc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1150,7 +1150,7 @@
 	{
 	    /* don't warn when deleting */
 	    if (!unload)
-		EMSGN(_("E86: Buffer %ld does not exist"), count);
+		EMSGN(_(e_nobufnr), count);
 	}
 	else if (dir == FORWARD)
 	    EMSG(_("E87: Cannot go beyond last buffer"));

src/globals.h

diff --git a/src/globals.h b/src/globals.h
index a26a8b5..474f74f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1571,6 +1571,7 @@
 EXTERN char_u e_intern2[]	INIT(= N_("E685: Internal error: %s"));
 EXTERN char_u e_maxmempat[]	INIT(= N_("E363: pattern uses more memory than 'maxmempattern'"));
 EXTERN char_u e_emptybuf[]	INIT(= N_("E749: empty buffer"));
+EXTERN char_u e_nobufnr[]	INIT(= N_("E86: Buffer %ld does not exist"));
 
 #ifdef FEAT_EX_EXTRA
 EXTERN char_u e_invalpat[]	INIT(= N_("E682: Invalid search pattern or delimiter"));

src/ops.c

diff --git a/src/ops.c b/src/ops.c
index 6df1121..a4261cb 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -856,11 +856,12 @@
     if (       (regname > 0 && ASCII_ISALNUM(regname))
 	    || (!writing && vim_strchr((char_u *)
 #ifdef FEAT_EVAL
-				    "/.%#:="
+				    "/.%:="
 #else
-				    "/.%#:"
+				    "/.%:"
 #endif
 					, regname) != NULL)
+	    || regname == '#'
 	    || regname == '"'
 	    || regname == '-'
 	    || regname == '_'
@@ -6514,6 +6515,27 @@
 	return;
     }
 
+    if (name == '#')
+    {
+	buf_T	*buf;
+
+	if (VIM_ISDIGIT(*str))
+	{
+	    int	num = atoi((char *)str);
+
+	    buf = buflist_findnr(num);
+	    if (buf == NULL)
+		EMSGN(_(e_nobufnr), (long)num);
+	}
+	else
+	    buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str),
+							 TRUE, FALSE, FALSE));
+	if (buf == NULL)
+	    return;
+	curwin->w_alt_fnum = buf->b_fnum;
+	return;
+    }
+
 #ifdef FEAT_EVAL
     if (name == '=')
     {

src/version.c

diff --git a/src/version.c b/src/version.c
index 18c41c7..17e442f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    605,
+/**/
     604,
 /**/
     603,