Synch to No Gnus 200510260928.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d2ae23..75682c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-26  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mm-uu.el (mm-uu-hide-markers): Fix XEmacs case.
+
 2005-10-26  Simon Josefsson  <jas@extundo.com>
 
        * flow-fill.el (fill-flowed): Flow-fill unquoted lines too, revert

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index e0bcaf2..af5a2c8 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -234,8 +234,8 @@ To disable dissecting shar codes, for instance, add
 (defcustom mm-uu-hide-markers
   (< 16 (or (and (fboundp 'defined-colors)
                 (length (defined-colors)))
-           (and (fboundp (device-color-cells))
-                (length (device-color-cells)))
+           (and (fboundp 'device-color-cells)
+                (device-color-cells))
            0))
   "If non-nil, hide verbatim markers.
 The value should be nil on displays where the face