summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-20 16:51:41 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-20 16:51:41 +0000
commit196b3b09ad079e217ad23c41ef3cf210e3a39571 (patch)
tree0aeaf0f49a453f345cb82ffb00b14752e117c22f /src
parentf9821064403de4af66e180ffbd7d466fe24afe47 (diff)
downloadvim-git-196b3b09ad079e217ad23c41ef3cf210e3a39571.tar.gz
updated for version 7.1-326v7.1.326
Diffstat (limited to 'src')
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 701354ee0..c5b520c66 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2142,7 +2142,9 @@ do_one_cmd(cmdlinep, sourcing,
#endif
- if (*p == '!' && ea.cmdidx != CMD_substitute) /* forced commands */
+ /* forced commands */
+ if (*p == '!' && ea.cmdidx != CMD_substitute
+ && ea.cmdidx != CMD_smagic && ea.cmdidx != CMD_snomagic)
{
++p;
ea.forceit = TRUE;
diff --git a/src/version.c b/src/version.c
index 00cbfa33e..66c5fdaa8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 326,
+/**/
325,
/**/
324,