diff options
| author | Mark A. Hershberger <mah@everybody.org> | 2005-11-03 03:56:38 +0000 |
|---|---|---|
| committer | Mark A. Hershberger <mah@everybody.org> | 2005-11-03 03:56:38 +0000 |
| commit | aaaa8abbd0247a37addc0907ac24a3eafedbd909 (patch) | |
| tree | 11513f2e6e5ac9aaac55ffb8435a1405e25c3095 | |
| parent | 0a24fa80376ce7ef6e765806922cf95642a4ea8f (diff) | |
| download | emacs-aaaa8abbd0247a37addc0907ac24a3eafedbd909.tar.gz | |
xml.el fixes
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/xml.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b3f6b78c57..d58ced9fbe4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/xml.el b/lisp/xml.el index 5fdb6f33b18..5b83f4d3479 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -279,10 +279,11 @@ If PARSE-NS is non-nil, then QNAMES are expanded." (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 @@ Returns one of: (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)))))))) |