updated for version 7.0061
diff --git a/src/eval.c b/src/eval.c
index 52d0a14..dd135af 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9042,14 +9042,17 @@
{
if (*varname == '&') /* window-local-option */
{
- /* set curwin to be our win, temporarily */
+ /* Set curwin to be our win, temporarily. Also set curbuf, so
+ * that we can get buffer-local options. */
oldcurwin = curwin;
curwin = win;
+ curbuf = win->w_buffer;
get_option_tv(&varname, rettv, 1);
/* restore previous notion of curwin */
curwin = oldcurwin;
+ curbuf = curwin->w_buffer;
}
else
{
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index f4a1302..2d8be32 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -112,11 +112,11 @@
EX(CMD_argadd, "argadd", ex_argadd,
BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR),
EX(CMD_argdelete, "argdelete", ex_argdelete,
- BANG|RANGE|NOTADR|COUNT|FILES|TRLBAR),
+ BANG|RANGE|NOTADR|FILES|TRLBAR),
EX(CMD_argdo, "argdo", ex_listdo,
BANG|NEEDARG|EXTRA|NOTRLCOM),
EX(CMD_argedit, "argedit", ex_argedit,
- BANG|NEEDARG|RANGE|NOTADR|COUNT|FILE1|EDITCMD|TRLBAR),
+ BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|TRLBAR),
EX(CMD_argglobal, "argglobal", ex_args,
BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_arglocal, "arglocal", ex_args,
diff --git a/src/main.c b/src/main.c
index 8c2e73f..9c17614 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1996,10 +1996,11 @@
{
/*
* We start commands on line 0, make "vim +/pat file" match a
- * pattern on line 1.
+ * pattern on line 1. But don't move the cursor when an autocommand
+ * with g`" was used.
*/
msg_scroll = TRUE;
- if (tagname == NULL)
+ if (tagname == NULL && curwin->w_cursor.lnum <= 1)
curwin->w_cursor.lnum = 0;
sourcing_name = (char_u *)"command line";
#ifdef FEAT_EVAL
diff --git a/src/po/it.po b/src/po/it.po
index cc966fa..61b22b3 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -1,6 +1,6 @@
# Italian Translation for Vim
#
-# FIRST AUTHOR Antonio Colombo <antonio.colombo@jrc.it>, 2000
+# FIRST AUTHOR Antonio Colombo <azc10@yahoo.com>, 2000
#
# Ogni commento è benvenuto...
# Every remark is very welcome...
@@ -16,7 +16,7 @@
"PO-Revision-Date: 2004-06-02 20:02+0200\n"
"Last-Translator: Vlad Sandrini <marco@sandrini.biz>\n"
"Language-Team: Italian"
-" Antonio Colombo <antonio.colombo@jrc.it>\n"
+" Antonio Colombo <azc10@yahoo.com>\n"
" Vlad Sandrini <marco@sandrini.biz>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO_8859-1\n"