summaryrefslogtreecommitdiff
path: root/src/misc1.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-03-27 09:02:11 +0000
committerBram Moolenaar <Bram@vim.org>2007-03-27 09:02:11 +0000
commit39353fdbec5558d5faa33cf35ff30ab96e2c366b (patch)
treebef6465f4900010ff666b9330c9b76ec21b03abf /src/misc1.c
parent5b6b1cae34a9e997bf185c269ba9e6be5b420008 (diff)
downloadvim-git-39353fdbec5558d5faa33cf35ff30ab96e2c366b.tar.gz
updated for version 7.0-222v7.0.222
Diffstat (limited to 'src/misc1.c')
-rw-r--r--src/misc1.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 000f3aef3..0f75c3a4f 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4796,8 +4796,11 @@ static int corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos));
static int find_last_paren __ARGS((char_u *l, int start, int end));
static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment));
+static int ind_hash_comment = 0; /* # starts a comment */
+
/*
* Skip over white space and C comments within the line.
+ * Also skip over Perl/shell comments if desired.
*/
static char_u *
cin_skipcomment(s)
@@ -4805,7 +4808,17 @@ cin_skipcomment(s)
{
while (*s)
{
+ char_u *prev_s = s;
+
s = skipwhite(s);
+
+ /* Perl/shell # comment comment continues until eol. Require a space
+ * before # to avoid recognizing $#array. */
+ if (ind_hash_comment != 0 && s != prev_s && *s == '#')
+ {
+ s += STRLEN(s);
+ break;
+ }
if (*s != '/')
break;
++s;
@@ -6133,7 +6146,7 @@ get_c_indent()
if (l[1] == '-')
n = -n;
/* When adding an entry here, also update the default 'cinoptions' in
- * change.txt, and add explanation for it! */
+ * doc/indent.txt, and add explanation for it! */
switch (*l)
{
case '>': ind_level = n; break;
@@ -6166,6 +6179,7 @@ get_c_indent()
case 'h': ind_scopedecl_code = n; break;
case 'j': ind_java = n; break;
case 'l': ind_keep_case_label = n; break;
+ case '#': ind_hash_comment = n; break;
}
}