[Emacs-diffs] Changes to emacs/lisp/select.el

[Juanma Barranquero]

Index: emacs/lisp/select.el
diff -c emacs/lisp/select.el:1.18 emacs/lisp/select.el:1.19
*** emacs/lisp/select.el:1.18   Tue Aug 13 20:57:55 2002
--- emacs/lisp/select.el        Wed Jan 29 04:19:46 2003
***************
*** 31,37 ****
  (defalias 'x-selection 'x-get-selection)
  (defun x-get-selection (&optional type data-type)
    "Return the value of an X Windows selection.
! The argument TYPE (default `PRIMARY') says which selection, 
  and the argument DATA-TYPE (default `STRING') says
  how to convert the data.
  
--- 31,37 ----
  (defalias 'x-selection 'x-get-selection)
  (defun x-get-selection (&optional type data-type)
    "Return the value of an X Windows selection.
! The argument TYPE (default `PRIMARY') says which selection,
  and the argument DATA-TYPE (default `STRING') says
  how to convert the data.
  
***************
*** 46,57 ****
  
  (defun x-set-selection (type data)
    "Make an X Windows selection of type TYPE and value DATA.
! The argument TYPE (default `PRIMARY') says which selection, 
  and DATA specifies the contents.  DATA may be a string,
  a symbol, an integer (or a cons of two integers or list of two integers).
  
  The selection may also be a cons of two markers pointing to the same buffer,
! or an overlay.  In these cases, the selection is considered to be the text 
  between the markers *at whatever time the selection is examined*.
  Thus, editing done in the buffer after you specify the selection
  can alter the effective value of the selection.
--- 46,57 ----
  
  (defun x-set-selection (type data)
    "Make an X Windows selection of type TYPE and value DATA.
! The argument TYPE (default `PRIMARY') says which selection,
  and DATA specifies the contents.  DATA may be a string,
  a symbol, an integer (or a cons of two integers or list of two integers).
  
  The selection may also be a cons of two markers pointing to the same buffer,
! or an overlay.  In these cases, the selection is considered to be the text
  between the markers *at whatever time the selection is examined*.
  Thus, editing done in the buffer after you specify the selection
  can alter the effective value of the selection.
***************
*** 118,128 ****
  (defun x-set-cut-buffer (string &optional push)
    "Store STRING into the X server's primary cut buffer.
  If PUSH is non-nil, also rotate the cut buffers:
! this means the previous value of the primary cut buffer moves the second
  cut buffer, and the second to the third, and so on (there are 8 buffers.)
  Cut buffers are considered obsolete; you should use selections instead."
!   ;; Check the data type of STRING.
!   (substring string 0 0)
    (if push
        (x-rotate-cut-buffers-internal 1))
    (x-store-cut-buffer-internal 'CUT_BUFFER0 string))
--- 118,127 ----
  (defun x-set-cut-buffer (string &optional push)
    "Store STRING into the X server's primary cut buffer.
  If PUSH is non-nil, also rotate the cut buffers:
! this means the previous value of the primary cut buffer moves to the second
  cut buffer, and the second to the third, and so on (there are 8 buffers.)
  Cut buffers are considered obsolete; you should use selections instead."
!   (or (stringp string) (signal 'wrong-type-argument (list 'string string)))
    (if push
        (x-rotate-cut-buffers-internal 1))
    (x-store-cut-buffer-internal 'CUT_BUFFER0 string))
***************
*** 191,197 ****
                               'STRING))
                (setq type 'STRING
                      str (encode-coding-string str 'iso-latin-1))))))
!             
         ((eq type 'COMPOUND_TEXT)
          (setq str (encode-coding-string str coding)))
  
--- 190,196 ----
                               'STRING))
                (setq type 'STRING
                      str (encode-coding-string str 'iso-latin-1))))))
! 
         ((eq type 'COMPOUND_TEXT)
          (setq str (encode-coding-string str coding)))