Merge from emacs--rel--22

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2e49f5e8a73321ba8997e1c5678c5784089c30a4..91dc9087047a024b93958113e8be644d1eec4f03 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -104,6 +104,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (exec-path execute
                        (repeat (choice (const :tag "default directory" nil)
                                        (directory :format "%v"))))
+            ;; charset.c
+            (charset-map-path installation
+                              (repeat (directory :format "%v")))
             ;; coding.c
             (inhibit-eol-conversion mule boolean)
             (eol-mnemonic-undecided mule string)
@@ -126,7 +129,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             :match (lambda (widget value)
                                      (and value (not (functionp value)))))
                            (function :value ignore))))
-            (selection-coding-system mule coding-system "22.1")
             ;; dired.c
             (completion-ignored-extensions dired
                                            (repeat (string :format "%v")))
@@ -462,10 +464,6 @@ since it could result in memory overflow and make Emacs crash."
 (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
 (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start
                     'custom-variable)
-(put 'selection-coding-system 'custom-set
-     (lambda (symbol value)
-       (set-selection-coding-system value)
-       (set symbol value)))
 
 ;; Record cus-start as loaded
 ;; if we have set up all the info that we can set up.