summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2007-07-09 01:27:20 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2007-07-09 01:27:20 +0000
commit7d79b956dc1f33d744b14707f207259fe456b596 (patch)
treea66241dd889c9c6b2f2b34b60306d9e7126b7d71 /lisp/cus-start.el
parent338f7c364d0906c395d5794a54de30a079cd8825 (diff)
downloademacs-7d79b956dc1f33d744b14707f207259fe456b596.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 38231f29a6c..76a4710b846 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