1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-28 10:56:36 +00:00

xml.el fixes

This commit is contained in:
Mark A. Hershberger 2005-11-03 03:56:38 +00:00
parent 0a24fa8037
commit aaaa8abbd0
2 changed files with 11 additions and 5 deletions

View File

@ -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

View File

@ -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))))))))