summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2011-07-16 14:12:14 -0400
committerGravatar Adam Chlipala <adam@chlipala.net>2011-07-16 14:12:14 -0400
commitf2f1a4873f59f768ff926dffd256147001ab4ea2 (patch)
tree700190769f64f545b40163305129f96d81413df4 /src
parent16ebb3f22f0fe19c588cb53aa8d58b9452ea4413 (diff)
First tutorial chapter ready
Diffstat (limited to 'src')
-rw-r--r--src/c/static.c2
-rw-r--r--src/elisp/urweb-mode.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/c/static.c b/src/c/static.c
index 6be67237..cf1d0330 100644
--- a/src/c/static.c
+++ b/src/c/static.c
@@ -37,6 +37,8 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "Error: %s\n", uw_error_message(ctx));
return 1;
}
+
+ uw_reset(ctx);
}
}
diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el
index 0beed1f9..9138dafb 100644
--- a/src/elisp/urweb-mode.el
+++ b/src/elisp/urweb-mode.el
@@ -170,8 +170,10 @@ See doc for the variable `urweb-mode-info'."
(finished nil)
(answer nil)
)
- (while (and (not finished) (re-search-backward "[<>{}]" nil t))
+ (while (and (not finished) (re-search-backward "[<>{}]|\\*\)" nil t))
(cond
+ ((looking-at "*)")
+ (search-backward "(*"))
((looking-at "{")
(if (> depth 0)
(decf depth)
@@ -183,7 +185,7 @@ See doc for the variable `urweb-mode-info'."
(looking-at "<>")))
(setq finished t))
((or (looking-at "< ") (looking-at "<="))
- nil)
+ (setq finished t))
((looking-at "<")
(setq finished t))
((looking-at ">")