From 3ab471278b0c4650a83ffa301bd7396bacaf4aed Mon Sep 17 00:00:00 2001
From: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Date: Fri, 19 Mar 2010 15:03:44 +0900
Subject: [PATCH] (www-xml-format-unit): Escape `&'.

---
 cwiki-common.el |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cwiki-common.el b/cwiki-common.el
index f6aa4ad..4a30be9 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -730,14 +730,15 @@
   (let (name props children ret)
     (cond
      ((stringp format-unit)
-      (www-format-encode-string format-unit 'without-tags)
-      ;; (mapconcat (lambda (c)
-      ;;              (cond
-      ;;               ((eq c ?<) "&amp;lt;")
-      ;;               ((eq c ?>) "&amp;gt;")
-      ;;               (t
-      ;;                (char-to-string c))))
-      ;;            format-unit "")
+      (mapconcat (lambda (c)
+		   (cond
+		    ((eq c ?&) "&amp;")
+                    ;; ((eq c ?<) "&amp;lt;")
+                    ;; ((eq c ?>) "&amp;gt;")
+		    (t
+		     (char-to-string c))))
+		 (www-format-encode-string format-unit 'without-tags)
+		 "")
       )
      ((consp format-unit)
       (setq name (car format-unit)
-- 
1.7.10.4