(describe-simplify-lib-file-name, find-source-lisp-file): Removed.

[bpt/emacs.git] / lisp / select.el

diff --git a/lisp/select.el b/lisp/select.el
index 47e3699..f2db407 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,15 +20,13 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;;; 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 +48,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.
@@ -59,6 +64,9 @@ other X clients.  But, if this variable is set, it is used for
 the next communication only.  After the communication, this
 variable is set to nil.")
 
+(declare-function x-get-selection-internal "xselect.c"
+                 (selection-symbol target-type &optional time-stamp))
+
 ;; This is for temporary compatibility with pre-release Emacs 19.
 (defalias 'x-selection 'x-get-selection)
 (defun x-get-selection (&optional type data-type)
@@ -83,7 +91,7 @@ in `selection-converter-alist', which see."
                       selection-coding-system
                       (cond ((eq data-type 'UTF8_STRING)
                              'utf-8)
-                            ((eq data-type 'COMPOUND-TEXT)
+                            ((eq data-type 'COMPOUND_TEXT)
                              'compound-text-with-extensions)
                             ((eq data-type 'C_STRING)
                              nil)
@@ -101,6 +109,11 @@ in `selection-converter-alist', which see."
   "Return text pasted to the clipboard."
   (x-get-selection-internal 'CLIPBOARD 'STRING))
 
+(declare-function x-own-selection-internal "xselect.c"
+                 (selection-name selection-value))
+(declare-function x-disown-selection-internal "xselect.c"
+                 (selection &optional time))
+
 (defun x-set-selection (type data)
   "Make an X Windows selection of type TYPE and value DATA.
 The argument TYPE (nil means `PRIMARY') says which selection, and
@@ -234,13 +247,12 @@ Cut buffers are considered obsolete; you should use selections instead."
        (let ((inhibit-read-only t))
          ;; Suppress producing escape sequences for compositions.
          (remove-text-properties 0 (length str) '(composition nil) str)
-         (if (not (multibyte-string-p str))
-             ;; Don't have to encode unibyte string.
-             (setq type 'C_STRING)
-           (if (eq type 'TEXT)
-               ;; TEXT is a polimorphic target.  We must select the
-               ;; actual type from `UTF8_STRING', `COMPOUND_TEXT',
-               ;; `STRING', and `C_STRING'.
+         (if (eq type 'TEXT)
+             ;; TEXT is a polymorphic target.  We must select the
+             ;; actual type from `UTF8_STRING', `COMPOUND_TEXT',
+             ;; `STRING', and `C_STRING'.
+             (if (not (multibyte-string-p str))
+                 (setq type 'C_STRING)
                (let (non-latin-1 non-unicode eight-bit)
                  (mapc #'(lambda (x)
                            (if (>= x #x100)
@@ -252,32 +264,32 @@ Cut buffers are considered obsolete; you should use selections instead."
                        str)
                  (setq type (if non-unicode 'COMPOUND_TEXT
                               (if non-latin-1 'UTF8_STRING
-                                (if eight-bit 'C_STRING 'STRING))))))
-           (cond
-            ((eq type 'UTF8_STRING)
-             (if (or (not coding)
-                     (not (eq (coding-system-type coding) 'utf-8)))
-                 (setq coding 'utf-8))
-             (setq str (encode-coding-string str coding)))
-
-            ((eq type 'STRING)
-             (if (or (not coding)
-                     (not (eq (coding-system-type coding) 'charset)))
-                 (setq coding 'iso-8859-1))
-             (setq str (encode-coding-string str coding)))
-
-            ((eq type 'COMPOUND_TEXT)
-             (if (or (not coding)
-                     (not (eq (coding-system-type coding) 'iso-2022)))
-                 (setq coding 'compound-text-with-extensions))
-             (setq str (encode-coding-string str coding)))
-
-            ((eq type 'C_STRING)
-             (setq str (string-make-unibyte str)))
-
-            (t
-             (error "Unknow selection type: %S" type))
-            ))))
+                                (if eight-bit 'C_STRING 'STRING)))))))
+         (cond
+          ((eq type 'UTF8_STRING)
+           (if (or (not coding)
+                   (not (eq (coding-system-type coding) 'utf-8)))
+               (setq coding 'utf-8))
+           (setq str (encode-coding-string str coding)))
+
+          ((eq type 'STRING)
+           (if (or (not coding)
+                   (not (eq (coding-system-type coding) 'charset)))
+               (setq coding 'iso-8859-1))
+           (setq str (encode-coding-string str coding)))
+
+          ((eq type 'COMPOUND_TEXT)
+           (if (or (not coding)
+                   (not (eq (coding-system-type coding) 'iso-2022)))
+               (setq coding 'compound-text-with-extensions))
+           (setq str (encode-coding-string str coding)))
+
+          ((eq type 'C_STRING)
+           (setq str (string-make-unibyte str)))
+
+          (t
+           (error "Unknow selection type: %S" type))
+          )))
 
       (setq next-selection-coding-system nil)
       (cons type str))))
@@ -450,5 +462,5 @@ This function returns the string \"emacs\"."
 
 (provide 'select)
 
-;;; arch-tag: bb634f97-8a3b-4b0a-b940-f6e09982328c
+;; arch-tag: bb634f97-8a3b-4b0a-b940-f6e09982328c
 ;;; select.el ends here