emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/select.el [lexbind]
Date: Sat, 04 Sep 2004 05:49:14 -0400

Index: emacs/lisp/select.el
diff -c emacs/lisp/select.el:1.17.2.3 emacs/lisp/select.el:1.17.2.4
*** emacs/lisp/select.el:1.17.2.3       Tue May 11 02:20:02 2004
--- emacs/lisp/select.el        Sat Sep  4 09:18:38 2004
***************
*** 3,9 ****
  ;; Maintainer: FSF
  ;; Keywords: internal
  
! ;; Copyright (c) 1993, 1994 Free Software Foundation, Inc.
  ;; Based partially on earlier release by Lucid.
  
  ;; This file is part of GNU Emacs.
--- 3,9 ----
  ;; Maintainer: FSF
  ;; Keywords: internal
  
! ;; Copyright (c) 1993, 1994, 2004 Free Software Foundation, Inc.
  ;; Based partially on earlier release by Lucid.
  
  ;; This file is part of GNU Emacs.
***************
*** 35,41 ****
  and the argument DATA-TYPE (default `STRING') says
  how to convert the data.
  
! TYPE may be `SECONDARY' or `CLIPBOARD', in addition to `PRIMARY'.
  DATA-TYPE is usually `STRING', but can also be one of the symbols
  in `selection-converter-alist', which see."
    (let ((data (x-get-selection-internal (or type 'PRIMARY)
--- 35,45 ----
  and the argument DATA-TYPE (default `STRING') says
  how to convert the data.
  
! TYPE may be any symbol \(but nil stands for `PRIMARY').  However,
! only a few symbols are commonly used.  They conventionally have
! all upper-case names.  The most often used ones, in addition to
! `PRIMARY', are `SECONDARY' and `CLIPBOARD'.
! 
  DATA-TYPE is usually `STRING', but can also be one of the symbols
  in `selection-converter-alist', which see."
    (let ((data (x-get-selection-internal (or type 'PRIMARY)
***************
*** 57,65 ****
  
  (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
--- 61,71 ----
  
  (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
! DATA specifies the contents.  TYPE must be a symbol.  \(It can also
! be a string, which stands for the symbol with that name, but this
! is considered obsolete.)  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
***************
*** 69,76 ****
  
  The data may also be a vector of valid non-vector selection values.
  
! Interactively, the text of the region is used as the selection value
! if the prefix arg is set."
    (interactive (if (not current-prefix-arg)
                   (list 'PRIMARY (read-string "Set text for pasting: "))
                 (list 'PRIMARY (buffer-substring (region-beginning) 
(region-end)))))
--- 75,85 ----
  
  The data may also be a vector of valid non-vector selection values.
  
! The return value is DATA.
! 
! Interactively, this command sets the primary selection.  Without
! prefix argument, it reads the selection in the minibuffer.  With
! prefix argument, it uses the text of the region as the selection value ."
    (interactive (if (not current-prefix-arg)
                   (list 'PRIMARY (read-string "Set text for pasting: "))
                 (list 'PRIMARY (buffer-substring (region-beginning) 
(region-end)))))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]