summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-02-23 21:34:44 +0000
committerBram Moolenaar <Bram@vim.org>2006-02-23 21:34:44 +0000
commit2a3f7eeebfa05a33cc1d8fbba66a3dff976e8dd7 (patch)
treeb4bd251efd74e42e1d3938da9968831c8b6d69ad /src
parentdf1bdc92c289d4531f82418f448466c99ca4bb78 (diff)
downloadvim-2a3f7eeebfa05a33cc1d8fbba66a3dff976e8dd7.zip
updated for version 7.0205
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.c24
-rw-r--r--src/ex_cmds.h12
2 files changed, 27 insertions, 9 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 235a6b13d..fa8cb2ce6 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5300,13 +5300,21 @@ ex_help(eap)
/*
* Re-use an existing help window or open a new one.
+ * Always open a new one for ":tab help".
*/
- if (!curwin->w_buffer->b_help)
+ if (!curwin->w_buffer->b_help
+#ifdef FEAT_WINDOWS
+ || cmdmod.tab != 0
+#endif
+ )
{
#ifdef FEAT_WINDOWS
- for (wp = firstwin; wp != NULL; wp = wp->w_next)
- if (wp->w_buffer != NULL && wp->w_buffer->b_help)
- break;
+ if (cmdmod.tab != 0)
+ wp = NULL;
+ else
+ for (wp = firstwin; wp != NULL; wp = wp->w_next)
+ if (wp->w_buffer != NULL && wp->w_buffer->b_help)
+ break;
if (wp != NULL && wp->w_buffer->b_nwindows > 0)
win_enter(wp, TRUE);
else
@@ -5325,19 +5333,21 @@ ex_help(eap)
#ifdef FEAT_WINDOWS
/* Split off help window; put it at far top if no position
- * specified, the current window is vertically split and narrow. */
+ * specified, the current window is vertically split and
+ * narrow. */
n = WSP_HELP;
# ifdef FEAT_VERTSPLIT
if (cmdmod.split == 0 && curwin->w_width != Columns
- && curwin->w_width < 80)
+ && curwin->w_width < 80)
n |= WSP_TOP;
# endif
if (win_split(0, n) == FAIL)
+ goto erret;
#else
/* use current window */
if (!can_abandon(curbuf, FALSE))
-#endif
goto erret;
+#endif
#ifdef FEAT_WINDOWS
if (curwin->w_height < p_hh)
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 49e86a458..71a0e2afb 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -877,18 +877,26 @@ EX(CMD_tag, "tag", ex_tag,
RANGE|NOTADR|BANG|WORD1|TRLBAR|ZEROR),
EX(CMD_tags, "tags", do_tags,
TRLBAR|CMDWIN),
-EX(CMD_tab, "tab", ex_tab,
- RANGE|NOTADR|COUNT|TRLBAR),
+EX(CMD_tab, "tab", ex_wrongmodifier,
+ NEEDARG|EXTRA|NOTRLCOM),
EX(CMD_tabclose, "tabclose", ex_tabclose,
RANGE|NOTADR|COUNT|BANG|TRLBAR|CMDWIN),
EX(CMD_tabedit, "tabedit", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_tabfind, "tabfind", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|NEEDARG|TRLBAR),
+EX(CMD_tabmove, "tabmove", ex_tabmove,
+ RANGE|NOTADR|COUNT|TRLBAR|ZEROR),
+EX(CMD_tabnext, "tabnext", ex_tabnext,
+ RANGE|NOTADR|COUNT|TRLBAR),
EX(CMD_tabnew, "tabnew", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_tabonly, "tabonly", ex_tabonly,
TRLBAR|CMDWIN),
+EX(CMD_tabprevious, "tabprevious", ex_tabprevious,
+ RANGE|NOTADR|COUNT|TRLBAR),
+EX(CMD_tabNext, "tabNext", ex_tabprevious,
+ RANGE|NOTADR|COUNT|TRLBAR),
EX(CMD_tabs, "tabs", ex_tabs,
TRLBAR|CMDWIN),
EX(CMD_tcl, "tcl", ex_tcl,