# HG changeset patch # User Glenn Morris # Date 1223019828 0 # Node ID c14273ed6b9f48379fbe5881bee4a0a4e3cb1cc7 # Parent 68275b258695af5929061ba6094e26efe41ebafd Mario Lang (xmltok-forward): Simplify. diff -r 68275b258695 -r c14273ed6b9f lisp/nxml/xmltok.el --- a/lisp/nxml/xmltok.el Fri Oct 03 07:24:54 2008 +0000 +++ b/lisp/nxml/xmltok.el Fri Oct 03 07:43:48 2008 +0000 @@ -315,16 +315,14 @@ (cond ((> space-count 0) (setq xmltok-type 'space)) (t - (goto-char (1+ (point))) + (forward-char 1) (xmltok-scan-after-lt)))) ((eq ch ?\&) (cond ((> space-count 0) (setq xmltok-type 'space)) (t - (goto-char (1+ (point))) - (xmltok-scan-after-amp - (lambda (start end) - (xmltok-handle-entity start end)))))) + (forward-char 1) + (xmltok-scan-after-amp 'xmltok-handle-entity)))) ((re-search-forward "[<&]\\|\\(]]>\\)" nil t) (cond ((not (match-beginning 1)) (goto-char (match-beginning 0))