(www-xml-format-unit): Escape `&'.

diff --git a/cwiki-common.el b/cwiki-common.el
index f6aa4ad..4a30be9 100644 (file)
--- 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)