Mario Lang <mlang at delysid.org>

(xmltok-forward): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index daebbff368801815f26a7ec3df803dafa1739cca..2e4da9a2ba5dad69cfb7e26bc41dd480fd4240d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-03  Mario Lang  <mlang@delysid.org>
+
+       * nxml/xmltok.el (xmltok-forward): Simplify.
+
 2008-10-03  Glenn Morris  <rgm@gnu.org>
 
        * frame.el (set-default-font): Make obsolete.

diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index 138d8e74a6b681d50a7a170bb11f1ee83d6befbc..fa17bf5c759d1684c73b0be636666504ed1d524e 100644 (file)
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -315,16 +315,14 @@ and VALUE-END, otherwise a STRING giving the value."
           (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))