summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2007-07-09 01:27:15 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2007-07-09 01:27:15 +0000
commit70c2811c5d55788bebd439ef7af2f6fa11be029f (patch)
tree0532453cd581e7939ffcb6d17a0d5f2f5910204f /lisp/cus-start.el
parent06071e68263c9db3d65fdf8b044d85543c7ec0b6 (diff)
downloademacs-70c2811c5d55788bebd439ef7af2f6fa11be029f.tar.gz
(file-coding-system-alist): Fix previous commit.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el32
1 files changed, 12 insertions, 20 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9eb1b5292a9..d48a0f248eb 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -116,26 +116,18 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
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