(selection-coding-system): Make it a defcustom, and add the properties

from cus-start.el.  Bump :version.

2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e1c40b930c..5bb3f728bdd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,6 +21,11 @@
 
 2008-02-08  Glenn Morris  <rgm@gnu.org>
 
+        * cus-start.el (selection-coding-system): Remove, since it's now
+        defined in select.el rather than in xselect.c.
+        * select.el (selection-coding-system): Make it a defcustom, and
+        add the properties from cus-start.el.  Bump :version.
+
         * custom.el (custom-theme-set-variables): Sort symbols that are
         dependencies before symbols that depend on them.
         (custom-enabled-themes): Set after custom-theme-directory.
diff --git a/lisp/select.el b/lisp/select.el
index 47e3699e281..34f63d7dd1b 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-(defvar selection-coding-system nil
+(defcustom selection-coding-system nil
   "Coding system for communicating with other X clients.
 
 When sending text via selection and clipboard, if the target
@@ -50,7 +50,14 @@ proper coding system is used according to the data-type as above.
 See also the documentation of the variable `x-select-request-type' how
 to control which data-type to request for receiving text.
 
-The default value is nil.")
+The default value is nil."
+  :type 'coding-system
+  :group 'mule
+  ;; Default was compound-text-with-extensions in 22.x (pre-unicode).
+  :version "23.1"
+  :set (lambda (symbol value)
+         (set-selection-coding-system value)
+         (set symbol value)))
 
 (defvar next-selection-coding-system nil
   "Coding system for the next communication with other X clients.