From 7ab8a85de1a7d02feece9dc168c99e783f026780 Mon Sep 17 00:00:00 2001 From: edyfox Date: Thu, 6 Nov 2008 12:36:30 +0000 Subject: [PATCH] Merged from the latest developing branch. git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1224 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/eval.c | 2 +- src/ex_cmds.h | 8 +++++--- src/version.c | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/eval.c b/src/eval.c index 447d3d78..e5ed0fa5 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3287,7 +3287,7 @@ ex_call(eap) if (*startarg != '(') { - EMSG2(_("E107: Missing braces: %s"), eap->arg); + EMSG2(_("E107: Missing parentheses: %s"), eap->arg); goto end; } diff --git a/src/ex_cmds.h b/src/ex_cmds.h index e8fef0a0..49167505 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -278,7 +278,7 @@ EX(CMD_cquit, "cquit", ex_cquit, EX(CMD_crewind, "crewind", ex_cc, RANGE|NOTADR|COUNT|TRLBAR|BANG), EX(CMD_cscope, "cscope", do_cscope, - EXTRA|NOTRLCOM|SBOXOK|XFILE), + EXTRA|NOTRLCOM|XFILE), EX(CMD_cstag, "cstag", do_cstag, BANG|TRLBAR|WORD1), EX(CMD_cunmap, "cunmap", ex_unmap, @@ -506,7 +506,7 @@ EX(CMD_lchdir, "lchdir", ex_cd, EX(CMD_lclose, "lclose", ex_cclose, RANGE|NOTADR|COUNT|TRLBAR), EX(CMD_lcscope, "lcscope", do_cscope, - EXTRA|NOTRLCOM|SBOXOK|XFILE), + EXTRA|NOTRLCOM|XFILE), EX(CMD_left, "left", ex_align, TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), EX(CMD_leftabove, "leftabove", ex_wrongmodifier, @@ -653,6 +653,8 @@ EX(CMD_nunmenu, "nunmenu", ex_menu, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), EX(CMD_open, "open", ex_open, RANGE|EXTRA), +EX(CMD_oldfiles, "oldfiles", ex_oldfiles, + BANG|TRLBAR|SBOXOK|CMDWIN), EX(CMD_omap, "omap", ex_map, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), EX(CMD_omapclear, "omapclear", ex_mapclear, @@ -804,7 +806,7 @@ EX(CMD_scriptnames, "scriptnames", ex_scriptnames, EX(CMD_scriptencoding, "scriptencoding", ex_scriptencoding, WORD1|TRLBAR|CMDWIN), EX(CMD_scscope, "scscope", do_scscope, - EXTRA|NOTRLCOM|SBOXOK), + EXTRA|NOTRLCOM), EX(CMD_set, "set", ex_set, TRLBAR|EXTRA|CMDWIN|SBOXOK), EX(CMD_setfiletype, "setfiletype", ex_setfiletype, diff --git a/src/version.c b/src/version.c index 5e8d3e69..ba25ff99 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 28, +/**/ + 27, +/**/ 26, /**/ 25, -- 2.11.4.GIT