diff options
| author | Glenn Morris | 2008-10-03 07:43:58 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-10-03 07:43:58 +0000 |
| commit | eb22cb8cba2b017c28f7fcf6162f8431640a653a (patch) | |
| tree | 053f2b06bda89d3ae0a9a7c60ce60cca509f21a6 /lisp/nxml | |
| parent | 52ef9375bb7116ff3252b5660047b39717a2168f (diff) | |
| download | emacs-eb22cb8cba2b017c28f7fcf6162f8431640a653a.tar.gz emacs-eb22cb8cba2b017c28f7fcf6162f8431640a653a.zip | |
Mario Lang <mlang at delysid.org>
(xmltok-forward): Simplify.
Diffstat (limited to 'lisp/nxml')
| -rw-r--r-- | lisp/nxml/xmltok.el | 8 |
1 files changed, 3 insertions, 5 deletions
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." | |||
| 315 | (cond ((> space-count 0) | 315 | (cond ((> space-count 0) |
| 316 | (setq xmltok-type 'space)) | 316 | (setq xmltok-type 'space)) |
| 317 | (t | 317 | (t |
| 318 | (goto-char (1+ (point))) | 318 | (forward-char 1) |
| 319 | (xmltok-scan-after-lt)))) | 319 | (xmltok-scan-after-lt)))) |
| 320 | ((eq ch ?\&) | 320 | ((eq ch ?\&) |
| 321 | (cond ((> space-count 0) | 321 | (cond ((> space-count 0) |
| 322 | (setq xmltok-type 'space)) | 322 | (setq xmltok-type 'space)) |
| 323 | (t | 323 | (t |
| 324 | (goto-char (1+ (point))) | 324 | (forward-char 1) |
| 325 | (xmltok-scan-after-amp | 325 | (xmltok-scan-after-amp 'xmltok-handle-entity)))) |
| 326 | (lambda (start end) | ||
| 327 | (xmltok-handle-entity start end)))))) | ||
| 328 | ((re-search-forward "[<&]\\|\\(]]>\\)" nil t) | 326 | ((re-search-forward "[<&]\\|\\(]]>\\)" nil t) |
| 329 | (cond ((not (match-beginning 1)) | 327 | (cond ((not (match-beginning 1)) |
| 330 | (goto-char (match-beginning 0)) | 328 | (goto-char (match-beginning 0)) |