[Emacs-diffs] Changes to emacs/lisp/cus-start.el,v [EMACS_22_BASE]

[Katsumi Yamaoka]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Katsumi Yamaoka <yamaoka>       07/07/09 01:27:20

Index: cus-start.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-start.el,v
retrieving revision 1.100.2.1
retrieving revision 1.100.2.2
diff -u -b -r1.100.2.1 -r1.100.2.2
--- cus-start.el        8 Jul 2007 23:41:36 -0000       1.100.2.1
+++ cus-start.el        9 Jul 2007 01:27:20 -0000       1.100.2.2
@@ -116,8 +116,7 @@
              mule
              (alist
               :key-type (regexp :tag "File regexp")
-              :value-type
-              (choice
+              :value-type (choice
                :value (undecided . undecided)
                (cons :tag "Encoding/decoding pair"
                      :value (undecided . undecided)
@@ -126,15 +125,8 @@
                (coding-system
                 :tag "Single coding system"
                 :value undecided
-                :validate
-                (lambda (widget)
-                  (unless (or (coding-system-p (widget-value widget))
-                              (functionp (widget-value widget)))
-                    (widget-put
-                     widget
-                     :error (format "Invalid coding system: %S"
-                                    (widget-value widget)))
-                    widget)))
+                            :match (lambda (widget value)
+                                     (and value (not (functionp value)))))
                (function :value ignore))))
             (selection-coding-system mule coding-system)
             ;; dired.c