Mercurial > emacs

changeset 81768:d6cb0c6eace7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(file-coding-system-alist): Fix previous commit.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 09 Jul 2007 01:27:15 +0000
parents d08e3bd69644
children 44b53335982a
files lisp/cus-start.el
diffstat 1 files changed, 12 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/cus-start.el	Sun Jul 08 23:43:42 2007 +0000
+++ b/lisp/cus-start.el	Mon Jul 09 01:27:15 2007 +0000
@@ -116,26 +116,18 @@
 	      mule
 	      (alist
 	       :key-type (regexp :tag "File regexp")
-	       :value-type
-	       (choice
-		:value (undecided . undecided)
-		(cons :tag "Encoding/decoding pair"
-		      :value (undecided . undecided)
-		      (coding-system :tag "Decoding")
-		      (coding-system :tag "Encoding"))
-		(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)))
-		(function :value ignore))))
+	       :value-type (choice
+			    :value (undecided . undecided)
+			    (cons :tag "Encoding/decoding pair"
+				  :value (undecided . undecided)
+				  (coding-system :tag "Decoding")
+				  (coding-system :tag "Encoding"))
+			    (coding-system
+			     :tag "Single coding system"
+			     :value undecided
+			     :match (lambda (widget value)
+				      (and value (not (functionp value)))))
+			    (function :value ignore))))
 	     (selection-coding-system mule coding-system)
 	     ;; dired.c
 	     (completion-ignored-extensions dired