Commit aaaa8abb authored by Mark A. Hershberger's avatar Mark A. Hershberger
Browse files

xml.el fixes

parent 0a24fa80
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> 2005-11-02 Andreas Schwab <schwab@suse.de>
   
* emacs-lisp/byte-opt.el (byte-optimize-pure-func): Quote the * emacs-lisp/byte-opt.el (byte-optimize-pure-func): Quote the
......
...@@ -279,10 +279,11 @@ If PARSE-NS is non-nil, then QNAMES are expanded." ...@@ -279,10 +279,11 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
(modify-syntax-entry ?. "_" table) (modify-syntax-entry ?. "_" table)
(modify-syntax-entry ?: "_" table) (modify-syntax-entry ?: "_" table)
;; XML [89] ;; XML [89]
(dolist (c '(#x00B7 #x02D0 #x02D1 #x0387 #x0640 #x0E46 #x0EC6 #x3005 (unless (featurep 'xemacs)
#x3031 #x3032 #x3033 #x3034 #x3035 #x309D #x309E #x30FC (dolist (c '(#x00B7 #x02D0 #x02D1 #x0387 #x0640 #x0E46 #x0EC6 #x3005
#x30FD #x30FE)) #x3031 #x3032 #x3033 #x3034 #x3035 #x309D #x309E #x30FC
(modify-syntax-entry (decode-char 'ucs c) "w" table)) #x30FD #x30FE))
(modify-syntax-entry (decode-char 'ucs c) "w" table)))
;; Fixme: rest of [4] ;; Fixme: rest of [4]
table) table)
"Syntax table used by `xml-parse-region'.") "Syntax table used by `xml-parse-region'.")
...@@ -473,7 +474,7 @@ Returns one of: ...@@ -473,7 +474,7 @@ Returns one of:
(if (stringp expansion) (if (stringp expansion)
(if (stringp (car children)) (if (stringp (car children))
;; The two strings were separated by a comment. ;; 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))) (cdr children)))
(setq children (append (list expansion) children))) (setq children (append (list expansion) children)))
(setq children (append expansion children)))))))) (setq children (append expansion children))))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment