summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-09-15 18:18:09 +0000
committerBram Moolenaar <Bram@vim.org>2006-09-15 18:18:09 +0000
commit15ff6c19406f0248146a16490b28f029c463c460 (patch)
tree6909600c85482f291c12746b180c288a34eae885
parente38536441c2a32e2e490fc882e3009792953155f (diff)
downloadvim-git-15ff6c19406f0248146a16490b28f029c463c460.tar.gz
updated for version 7.0-109v7.0.109
-rw-r--r--src/misc1.c17
-rw-r--r--src/version.c2
2 files changed, 16 insertions, 3 deletions
diff --git a/src/misc1.c b/src/misc1.c
index b74ce0de4..0c2b797cf 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -8074,9 +8074,20 @@ get_lisp_indent()
}
if (*that == '"' && *(that + 1) != NUL)
{
- that++;
- while (*that && (*that != '"' || *(that - 1) == '\\'))
- ++that;
+ while (*++that && *that != '"')
+ {
+ /* skipping escaped characters in the string */
+ if (*that == '\\')
+ {
+ if (*++that == NUL)
+ break;
+ if (that[1] == NUL)
+ {
+ ++that;
+ break;
+ }
+ }
+ }
}
if (*that == '(' || *that == '[')
++parencount;
diff --git a/src/version.c b/src/version.c
index 67a065046..3a4c118b8 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 */
/**/
+ 109,
+/**/
108,
/**/
107,