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

[Eli Zaretskii]

Index: emacs/src/w16select.c
diff -c emacs/src/w16select.c:1.26 emacs/src/w16select.c:1.27
*** emacs/src/w16select.c:1.26  Sat Feb 23 03:54:20 2002
--- emacs/src/w16select.c       Fri May 17 09:17:21 2002
***************
*** 1,6 ****
  /* 16-bit Windows Selection processing for emacs on MS-Windows
     Copyright (C) 1996, 1997, 2001 Free Software Foundation.
!    
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify
--- 1,6 ----
  /* 16-bit Windows Selection processing for emacs on MS-Windows
     Copyright (C) 1996, 1997, 2001 Free Software Foundation.
! 
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify
***************
*** 168,174 ****
  empty_clipboard ()
  {
    __dpmi_regs regs;
!   
    /* Calls Int 2Fh/AX=1702h
       Return Values   AX == 0: Error occurred
                        <> 0: OK, Clipboard emptied */
--- 168,174 ----
  empty_clipboard ()
  {
    __dpmi_regs regs;
! 
    /* Calls Int 2Fh/AX=1702h
       Return Values   AX == 0: Error occurred
                        <> 0: OK, Clipboard emptied */
***************
*** 399,405 ****
         the next loop by an additional test.  */
        register unsigned char *lcdp =
        last_clipboard_text == NULL ? &null_char : last_clipboard_text;
!       
        /* Copy data from low memory, remove CR
         characters before LF if needed.  */
        _farsetsel (_dos_ds);
--- 399,405 ----
         the next loop by an additional test.  */
        register unsigned char *lcdp =
        last_clipboard_text == NULL ? &null_char : last_clipboard_text;
! 
        /* Copy data from low memory, remove CR
         characters before LF if needed.  */
        _farsetsel (_dos_ds);
***************
*** 486,495 ****
       Lisp_Object string, frame;
  {
    unsigned ok = 1, put_status = 0;
!   int nbytes;
    unsigned char *src, *dst = NULL;
-   int charset_info;
-   int no_crlf_conversion;
  
    CHECK_STRING (string);
  
--- 486,493 ----
       Lisp_Object string, frame;
  {
    unsigned ok = 1, put_status = 0;
!   int nbytes, charset_info, no_crlf_conversion;
    unsigned char *src, *dst = NULL;
  
    CHECK_STRING (string);
  
***************
*** 606,613 ****
    unsigned data_size, truelen;
    unsigned char *htext;
    Lisp_Object ret = Qnil;
!   int no_crlf_conversion;
!   int require_encoding = 0;
  
    if (NILP (frame))
      frame = Fselected_frame ();
--- 604,610 ----
    unsigned data_size, truelen;
    unsigned char *htext;
    Lisp_Object ret = Qnil;
!   int no_crlf_conversion, require_encoding = 0;
  
    if (NILP (frame))
      frame = Fselected_frame ();
***************
*** 685,693 ****
  
   unblock:
    UNBLOCK_INPUT;
!   
   done:
!   
    return (ret);
  }
  
--- 682,690 ----
  
   unblock:
    UNBLOCK_INPUT;
! 
   done:
! 
    return (ret);
  }
  
***************
*** 736,742 ****
    return Qnil;
  }
  
! void 
  syms_of_win16select ()
  {
    defsubr (&Sw16_set_clipboard_data);
--- 733,739 ----
    return Qnil;
  }
  
! void
  syms_of_win16select ()
  {
    defsubr (&Sw16_set_clipboard_data);