# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1183938086 0
# Node ID a9af9c6eaaadd56e749cf9aa898930c72962dd46
# Parent  7effaa2c79bd5bc2ce07a54e728a7ea6f462b8c3
(file-coding-system-alist): Fix custom type.

diff -r 7effaa2c79bd -r a9af9c6eaaad lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 08 19:35:50 2007 +0000
+++ b/lisp/ChangeLog	Sun Jul 08 23:41:26 2007 +0000
@@ -1,3 +1,7 @@
+2007-07-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* cus-start.el (file-coding-system-alist): Fix custom type.
+
 2007-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-cvs.el (vc-cvs-revert): Use vc-default-revert.
diff -r 7effaa2c79bd -r a9af9c6eaaad lisp/cus-start.el
--- a/lisp/cus-start.el	Sun Jul 08 19:35:50 2007 +0000
+++ b/lisp/cus-start.el	Sun Jul 08 23:41:26 2007 +0000
@@ -116,15 +116,26 @@
 	      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)
-			    (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
+		 :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))))
 	     (selection-coding-system mule coding-system)
 	     ;; dired.c
 	     (completion-ignored-extensions dired