[Emacs-diffs] Changes to emacs/src/macselect.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macselect.c
diff -c emacs/src/macselect.c:1.6 emacs/src/macselect.c:1.7
*** emacs/src/macselect.c:1.6   Thu Jul 14 09:23:12 2005
--- emacs/src/macselect.c       Sat Jul 23 07:48:43 2005
***************
*** 712,718 ****
  {
    check_mac ();
    CHECK_SYMBOL (selection_name);
!   if (NILP (selection_value)) error ("selection-value may not be nil");
    x_own_selection (selection_name, selection_value);
    return selection_value;
  }
--- 712,718 ----
  {
    check_mac ();
    CHECK_SYMBOL (selection_name);
!   if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
    x_own_selection (selection_name, selection_value);
    return selection_value;
  }
***************
*** 724,734 ****
  
  DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
         Sx_get_selection_internal, 2, 3, 0,
!        doc: /* Return text selected from some Mac window.
  SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  TYPE is the type of data desired, typically `STRING'.
  TIME_STAMP is ignored on Mac.  */)
!   (selection_symbol, target_type, time_stamp)
       Lisp_Object selection_symbol, target_type, time_stamp;
  {
    Lisp_Object val = Qnil;
--- 724,734 ----
  
  DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
         Sx_get_selection_internal, 2, 3, 0,
!        doc: /* Return text selected from some Mac application.
  SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  TYPE is the type of data desired, typically `STRING'.
  TIME_STAMP is ignored on Mac.  */)
!      (selection_symbol, target_type, time_stamp)
       Lisp_Object selection_symbol, target_type, time_stamp;
  {
    Lisp_Object val = Qnil;
***************
*** 821,827 ****
  
  DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
         0, 1, 0,
!        doc: /* Whether the current Emacs process owns the given Selection.
  The arg should be the name of the selection in question, typically one of
  the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  For convenience, the symbol nil is the same as `PRIMARY',
--- 821,827 ----
  
  DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
         0, 1, 0,
!        doc: /* Whether the current Emacs process owns the given SELECTION.
  The arg should be the name of the selection in question, typically one of
  the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  For convenience, the symbol nil is the same as `PRIMARY',
***************
*** 866,872 ****
  
  DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
         0, 1, 0,
!        doc: /* Whether there is an owner for the given Selection.
  The arg should be the name of the selection in question, typically one of
  the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  For convenience, the symbol nil is the same as `PRIMARY',
--- 866,872 ----
  
  DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
         0, 1, 0,
!        doc: /* Whether there is an owner for the given SELECTION.
  The arg should be the name of the selection in question, typically one of
  the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
  For convenience, the symbol nil is the same as `PRIMARY',
***************
*** 1077,1083 ****
  and the local selection value (whatever was given to `x-own-selection').
  
  The function should return the value to send to the Scrap Manager
! \(a string).  A return value of nil
  means that the conversion could not be done.
  A return value which is the symbol `NULL'
  means that a side-effect was executed,
--- 1077,1083 ----
  and the local selection value (whatever was given to `x-own-selection').
  
  The function should return the value to send to the Scrap Manager
! \(must be a string).  A return value of nil
  means that the conversion could not be done.
  A return value which is the symbol `NULL'
  means that a side-effect was executed,