Mercurial > emacs
changeset 66646:173cd676da78
xml.el fixes
| author | Mark A. Hershberger <mah@everybody.org> |
|---|---|
| date | Thu, 03 Nov 2005 03:56:38 +0000 |
| parents | 98ed2e52cea0 |
| children | f6c8a712bfcd |
| files | lisp/ChangeLog lisp/xml.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 03 02:03:24 2005 +0000 +++ b/lisp/ChangeLog Thu Nov 03 03:56:38 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-02 Mark A. Hershberger <mah@everybody.org> + + * xml.el (xml-syntax-table): Allow xml.el to compile in xemacs. + (xml-parse-tag): Join strings separated by a comment properly. + 2005-11-02 Andreas Schwab <schwab@suse.de> * emacs-lisp/byte-opt.el (byte-optimize-pure-func): Quote the
--- a/lisp/xml.el Thu Nov 03 02:03:24 2005 +0000 +++ b/lisp/xml.el Thu Nov 03 03:56:38 2005 +0000 @@ -279,10 +279,11 @@ (modify-syntax-entry ?. "_" table) (modify-syntax-entry ?: "_" table) ;; XML [89] - (dolist (c '(#x00B7 #x02D0 #x02D1 #x0387 #x0640 #x0E46 #x0EC6 #x3005 - #x3031 #x3032 #x3033 #x3034 #x3035 #x309D #x309E #x30FC - #x30FD #x30FE)) - (modify-syntax-entry (decode-char 'ucs c) "w" table)) + (unless (featurep 'xemacs) + (dolist (c '(#x00B7 #x02D0 #x02D1 #x0387 #x0640 #x0E46 #x0EC6 #x3005 + #x3031 #x3032 #x3033 #x3034 #x3035 #x309D #x309E #x30FC + #x30FD #x30FE)) + (modify-syntax-entry (decode-char 'ucs c) "w" table))) ;; Fixme: rest of [4] table) "Syntax table used by `xml-parse-region'.") @@ -473,7 +474,7 @@ (if (stringp expansion) (if (stringp (car children)) ;; The two strings were separated by a comment. - (setq children (append (concat (car children) expansion) + (setq children (append (list (concat (car children) expansion)) (cdr children))) (setq children (append (list expansion) children))) (setq children (append expansion children))))))))