From 3f9bd117b37c9feb9f37a6e9ac84bbb4697f86d3 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 2 Aug 2011 17:28:37 -0400 Subject: Improve detection of XML in urweb-mode; small tutorial improvement --- src/elisp/urweb-mode.el | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'src/elisp') diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el index c9fe5f19..c4cb3476 100644 --- a/src/elisp/urweb-mode.el +++ b/src/elisp/urweb-mode.el @@ -170,7 +170,7 @@ 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 "{") (if (> depth 0) @@ -178,29 +178,14 @@ See doc for the variable `urweb-mode-info'." (setq finished t))) ((looking-at "}") (incf depth)) - ((save-excursion (backward-char 1) (or (looking-at "=>") - (looking-at "->") - (looking-at "<>"))) - nil) - ((or (looking-at "< ") (looking-at "<=")) - nil) - ((looking-at "<") - (setq finished t)) - ((save-excursion (backward-char 1) (looking-at " >")) - nil) - ((looking-at ">") - (cond - ((> depth 0) - (if (not (re-search-backward "<" nil t)) - (setq finished t))) - ((save-excursion (backward-char 1) (looking-at " ")) - (setq finished t)) - (t - (progn (backward-char 4) - (setq answer (not (or - (looking-at "/xml") - (looking-at "xml/")))) - (setq finished t))))))) + ((looking-at "") + (if (> depth 0) + (decf depth) + (progn + (setq answer t) + (setq finished t)))) + ((looking-at "") + (incf depth)))) answer))) (defun amAttribute (face) -- cgit v1.2.3