From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Oct 2008 07:43:58 +0000 (+0000)
Subject: Mario Lang  <mlang at delysid.org>
X-Git-Tag: emacs-pretest-23.0.90~2669
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb22cb8cba2b017c28f7fcf6162f8431640a653a;p=emacs.git

Mario Lang  <mlang at delysid.org>

(xmltok-forward): Simplify.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index daebbff3688..2e4da9a2ba5 100644
--- 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 138d8e74a6b..fa17bf5c759 100644
--- 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))