diff options
| author | Katsumi Yamaoka | 2007-07-09 01:27:20 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2007-07-09 01:27:20 +0000 |
| commit | 7d79b956dc1f33d744b14707f207259fe456b596 (patch) | |
| tree | a66241dd889c9c6b2f2b34b60306d9e7126b7d71 | |
| parent | 338f7c364d0906c395d5794a54de30a079cd8825 (diff) | |
| download | emacs-7d79b956dc1f33d744b14707f207259fe456b596.tar.gz emacs-7d79b956dc1f33d744b14707f207259fe456b596.zip | |
(file-coding-system-alist): Fix previous commit.
| -rw-r--r-- | lisp/cus-start.el | 32 |
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 | |||
| 116 | mule | 116 | mule |
| 117 | (alist | 117 | (alist |
| 118 | :key-type (regexp :tag "File regexp") | 118 | :key-type (regexp :tag "File regexp") |
| 119 | :value-type | 119 | :value-type (choice |
| 120 | (choice | 120 | :value (undecided . undecided) |
| 121 | :value (undecided . undecided) | 121 | (cons :tag "Encoding/decoding pair" |
| 122 | (cons :tag "Encoding/decoding pair" | 122 | :value (undecided . undecided) |
| 123 | :value (undecided . undecided) | 123 | (coding-system :tag "Decoding") |
| 124 | (coding-system :tag "Decoding") | 124 | (coding-system :tag "Encoding")) |
| 125 | (coding-system :tag "Encoding")) | 125 | (coding-system |
| 126 | (coding-system | 126 | :tag "Single coding system" |
| 127 | :tag "Single coding system" | 127 | :value undecided |
| 128 | :value undecided | 128 | :match (lambda (widget value) |
| 129 | :validate | 129 | (and value (not (functionp value))))) |
| 130 | (lambda (widget) | 130 | (function :value ignore)))) |
| 131 | (unless (or (coding-system-p (widget-value widget)) | ||
| 132 | (functionp (widget-value widget))) | ||
| 133 | (widget-put | ||
| 134 | widget | ||
| 135 | :error (format "Invalid coding system: %S" | ||
| 136 | (widget-value widget))) | ||
| 137 | widget))) | ||
| 138 | (function :value ignore)))) | ||
| 139 | (selection-coding-system mule coding-system) | 131 | (selection-coding-system mule coding-system) |
| 140 | ;; dired.c | 132 | ;; dired.c |
| 141 | (completion-ignored-extensions dired | 133 | (completion-ignored-extensions dired |