diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index e77d05aad5..e0c82c3fcc 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1813,12 +1813,9 @@ write_viminfo(file, forceit)
 	{
 #ifdef VMS
 	    /* fdopen() fails for some reason */
-	    if (fp_out == NULL)
-	    {
-		umask_save = umask(077);
-		fp_out = mch_fopen((char *)tempname, WRITEBIN);
-		(void)umask(umask_save);
-	    }
+	    umask_save = umask(077);
+	    fp_out = mch_fopen((char *)tempname, WRITEBIN);
+	    (void)umask(umask_save);
 #else
 	    int	fd;
 
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index b5ae8f841f..a8d8a64f2a 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -906,7 +906,7 @@ EX(CMD_tabnext,		"tabnext",	ex_tabnext,
 EX(CMD_tabnew,		"tabnew",	ex_splitview,
 			BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
 EX(CMD_tabonly,		"tabonly",	ex_tabonly,
-			TRLBAR|CMDWIN),
+			BANG|TRLBAR|CMDWIN),
 EX(CMD_tabprevious,	"tabprevious",	ex_tabnext,
 			RANGE|NOTADR|COUNT|TRLBAR),
 EX(CMD_tabNext,		"tabNext",	ex_tabnext,