Index: xemacs-20.0/CHANGES-beta
diff -c xemacs-20.0/CHANGES-beta:1.27 xemacs-20.0/CHANGES-beta:1.28
*** xemacs-20.0/CHANGES-beta:1.27	Tue Apr 15 21:07:25 1997
--- xemacs-20.0/CHANGES-beta	Wed Apr 16 11:07:31 1997
***************
*** 1,5 ****
--- 1,9 ----
  							-*- indented-text -*-
  to 20.1
+ -- Commercial sound driver fix
+ -- Wnn6 corrections
+ -- Filling corrections
+ -- Animated GIF boo boo.
  -- time.el-1.15
  -- itimer.el-1.06
  -- facemenu-keymap moved to `C-x F'
Index: xemacs-20.0/lisp/prim/fill.el
diff -c xemacs-20.0/lisp/prim/fill.el:1.5 xemacs-20.0/lisp/prim/fill.el:1.6
*** xemacs-20.0/lisp/prim/fill.el:1.5	Tue Apr 15 21:07:55 1997
--- xemacs-20.0/lisp/prim/fill.el	Wed Apr 16 11:07:34 1997
***************
*** 354,360 ****
  	  ;; loses on split abbrevs ("Mr.\nSmith")
  	  (while (re-search-forward "[.?!][])}\"']*$" nil t)
  	    ;; XEmacs change (no insert-and-inherit)
! 	    (or (eobp) (insert ?\ )))
  	  (goto-char from)
  	  (skip-chars-forward " \t")
  	  ;; Then change all newlines to spaces.
--- 354,360 ----
  	  ;; loses on split abbrevs ("Mr.\nSmith")
  	  (while (re-search-forward "[.?!][])}\"']*$" nil t)
  	    ;; XEmacs change (no insert-and-inherit)
! 	    (or (eobp) (insert ?\  ?\ )))
  	  (goto-char from)
  	  (skip-chars-forward " \t")
  	  ;; Then change all newlines to spaces.
***************
*** 391,396 ****
--- 391,397 ----
  	      (delete-char 1)		; delete newline
  	      (end-of-line)))
  	  ;; end patch
+ 	  (goto-char from)
   	  (if (and nosqueeze (not (eq justify 'full)))
  	      nil
  	    (canonically-space-region (or squeeze-after (point)) (point-max))
Index: xemacs-20.0/src/dgif_lib.c
diff -c xemacs-20.0/src/dgif_lib.c:1.2 xemacs-20.0/src/dgif_lib.c:1.3
*** xemacs-20.0/src/dgif_lib.c:1.2	Fri Mar 21 22:03:23 1997
--- xemacs-20.0/src/dgif_lib.c	Wed Apr 16 11:07:36 1997
***************
*** 240,245 ****
--- 240,254 ----
  	    GifFile->SColorMap->Colors[i].Green = Buf[1];
  	    GifFile->SColorMap->Colors[i].Blue = Buf[2];
  	}
+     } else {
+ 	/* XEmacs assumes we always have a colormap */
+ 	GifFile->SColorMap = MakeMapObject(2, NULL);
+ 	GifFile->SColorMap->Colors[0].Red = 0;
+ 	GifFile->SColorMap->Colors[0].Green = 0;
+ 	GifFile->SColorMap->Colors[0].Blue = 0;
+ 	GifFile->SColorMap->Colors[1].Red = 0xff;
+ 	GifFile->SColorMap->Colors[1].Green = 0xff;
+ 	GifFile->SColorMap->Colors[1].Blue = 0xff;
      }
  
      return GIF_OK;
Index: xemacs-20.0/src/linuxplay.c
diff -c xemacs-20.0/src/linuxplay.c:1.4 xemacs-20.0/src/linuxplay.c:1.5
*** xemacs-20.0/src/linuxplay.c:1.4	Sat Apr 12 20:14:34 1997
--- xemacs-20.0/src/linuxplay.c	Wed Apr 16 11:07:37 1997
***************
*** 814,831 ****
  
    /* Initialize sound hardware with prefered parameters */
    
-   /* The PCSP driver does not support reading of the sampling rate via the
-      SOUND_PCM_READ_RATE ioctl; determine "the_speed" here */     
-   the_speed = speed; ioctl(audio_fd,SNDCTL_DSP_SPEED,&the_speed);
-   /* The PCSP driver does not support reading of the mono/stereo flag, thus
-      we assume, that failure to change this mode means we are in mono mode  */
-   if (((i = (the_stereo = tracks)-1),ioctl(audio_fd,SNDCTL_DSP_STEREO,&i)) < 0)
-     the_stereo = 1;
-   the_fmt = fmt;     ioctl(audio_fd,SNDCTL_DSP_SETFMT,&the_fmt);
- 
    /* If the sound hardware cannot support 16 bit format or requires a
       different byte sex then try to drop to 8 bit format */
!   the_fmt = AFMT_QUERY; ioctl(audio_fd,SNDCTL_DSP_SETFMT,&the_fmt);
    if (fmt != the_fmt) {
      if (fmt == AFMT_S16_LE || fmt == AFMT_S16_BE) {
        *sndcnv = fmt == AFMT_S16_BE ? sndcnv2byteBE : sndcnv2byteLE;
--- 814,828 ----
  
    /* Initialize sound hardware with prefered parameters */
    
    /* If the sound hardware cannot support 16 bit format or requires a
       different byte sex then try to drop to 8 bit format */
! 
!   the_fmt = fmt;
!   if(ioctl(audio_fd,SNDCTL_DSP_SETFMT,&the_fmt) < 0) {
!   	perror("SNDCTL_DSP_SETFMT");
!   	return(0);
!   }
! 
    if (fmt != the_fmt) {
      if (fmt == AFMT_S16_LE || fmt == AFMT_S16_BE) {
        *sndcnv = fmt == AFMT_S16_BE ? sndcnv2byteBE : sndcnv2byteLE;
***************
*** 844,849 ****
--- 841,854 ----
          fmt != the_fmt) {
        perror("SNDCTRL_DSP_SETFMT");
        return(0); } }
+ 
+   /* The PCSP driver does not support reading of the sampling rate via the
+      SOUND_PCM_READ_RATE ioctl; determine "the_speed" here */     
+   the_speed = speed; ioctl(audio_fd,SNDCTL_DSP_SPEED,&the_speed);
+   /* The PCSP driver does not support reading of the mono/stereo flag, thus
+      we assume, that failure to change this mode means we are in mono mode  */
+   if (((i = (the_stereo = tracks)-1),ioctl(audio_fd,SNDCTL_DSP_STEREO,&i)) < 0)
+     the_stereo = 1;
  
    /* Try to request stereo playback (if needed); if this cannot be supported
       by the hardware, then install conversion routines for mono playback */
Index: xemacs-20.0/src/mule-wnnfns.c
diff -c xemacs-20.0/src/mule-wnnfns.c:1.5 xemacs-20.0/src/mule-wnnfns.c:1.6
*** xemacs-20.0/src/mule-wnnfns.c:1.5	Tue Apr 15 21:08:27 1997
--- xemacs-20.0/src/mule-wnnfns.c	Wed Apr 16 11:07:37 1997
***************
*** 699,705 ****
    no = XINT (bunNo);
  #ifdef	WNN6
    if ((cnt = jl_fi_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
! 			      (dai == Qnil) ? WNN_SHO : WNN_DAI)) < 0)
      return Qnil;
  #else
    if ((cnt = jl_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
--- 699,705 ----
    no = XINT (bunNo);
  #ifdef	WNN6
    if ((cnt = jl_fi_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
! 			      (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0)
      return Qnil;
  #else
    if ((cnt = jl_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
***************
*** 1269,1275 ****
    int   snum;
    CHECK_STRING (args[0]);
    CHECK_STRING (args[1]);
!   if (args[3] != Qnil) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
--- 1269,1275 ----
    int   snum;
    CHECK_STRING (args[0]);
    CHECK_STRING (args[1]);
!   if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
***************
*** 1279,1287 ****
                  XSTRING(args[1])->_data,
  		WNN_FI_SYSTEM_DICT,
  		WNN_DIC_RDONLY,
!                 (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW,
  		0,
!                 (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data,
                  yes_or_no,
                  puts2 ) < 0) {
      UNGCPRO;
--- 1279,1287 ----
                  XSTRING(args[1])->_data,
  		WNN_FI_SYSTEM_DICT,
  		WNN_DIC_RDONLY,
!                 (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
  		0,
!                 (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
                  yes_or_no,
                  puts2 ) < 0) {
      UNGCPRO;
***************
*** 1302,1309 ****
    int   snum;
    CHECK_STRING (args[0]);
    CHECK_STRING (args[1]);
!   if (args[4] != Qnil) CHECK_STRING (args[4]);
!   if (args[5] != Qnil) CHECK_STRING (args[5]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
--- 1302,1309 ----
    int   snum;
    CHECK_STRING (args[0]);
    CHECK_STRING (args[1]);
!   if (!EQ(args[4], Qnil)) CHECK_STRING (args[4]);
!   if (!EQ(args[5], Qnil)) CHECK_STRING (args[5]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
***************
*** 1312,1321 ****
                  XSTRING(args[0])->_data,
                  XSTRING(args[1])->_data,
                  WNN_FI_USER_DICT,
!                 (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW,
! 		(args[3] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW,
! 		(args[4] == Qnil) ? 0 : XSTRING(args[4])->_data,
!                 (args[5] == Qnil) ? 0 : XSTRING(args[5])->_data,
                  yes_or_no,
                  puts2 ) < 0) {
      UNGCPRO;
--- 1312,1321 ----
                  XSTRING(args[0])->_data,
                  XSTRING(args[1])->_data,
                  WNN_FI_USER_DICT,
!                 (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
! 		(EQ(args[3], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
! 		(EQ(args[4], Qnil)) ? 0 : XSTRING(args[4])->_data,
!                 (EQ(args[5], Qnil)) ? 0 : XSTRING(args[5])->_data,
                  yes_or_no,
                  puts2 ) < 0) {
      UNGCPRO;
***************
*** 1339,1345 ****
    struct wnn_henkan_env henv;
    CHECK_STRING (args[0]);
    CHECK_INT (args[1]);
!   if (args[3] != Qnil) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
--- 1339,1345 ----
    struct wnn_henkan_env henv;
    CHECK_STRING (args[0]);
    CHECK_INT (args[1]);
!   if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
***************
*** 1356,1362 ****
  			      wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
  			      XINT(args[1]),
  			      WNN_DIC_RW, WNN_DIC_RW,
! 			      (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data,
  			      0,
  			      yes_or_no,
  			      puts2)) < 0) {
--- 1356,1362 ----
  			      wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
  			      XINT(args[1]),
  			      WNN_DIC_RW, WNN_DIC_RW,
! 			      (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
  			      0,
  			      yes_or_no,
  			      puts2)) < 0) {
***************
*** 1373,1379 ****
        }
    }
    vmask |= WNN_ENV_MUHENKAN_LEARN_MASK;
!   henv.muhenkan_flag = (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) {
--- 1373,1379 ----
        }
    }
    vmask |= WNN_ENV_MUHENKAN_LEARN_MASK;
!   henv.muhenkan_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) {
***************
*** 1398,1404 ****
    struct wnn_henkan_env henv;
    CHECK_STRING (args[0]);
    CHECK_INT (args[1]);
!   if (args[3] != Qnil) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
--- 1398,1404 ----
    struct wnn_henkan_env henv;
    CHECK_STRING (args[0]);
    CHECK_INT (args[1]);
!   if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    GCPRO1 (*args);
***************
*** 1415,1421 ****
                                wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
                                XINT(args[1]),
                                WNN_DIC_RW, WNN_DIC_RW,
!                               (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data,
                                0,
                                yes_or_no,
                                puts2)) < 0) {
--- 1415,1421 ----
                                wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
                                XINT(args[1]),
                                WNN_DIC_RW, WNN_DIC_RW,
!                               (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
                                0,
                                yes_or_no,
                                puts2)) < 0) {
***************
*** 1432,1438 ****
        }
    }
    vmask |= WNN_ENV_BUNSETSUGIRI_LEARN_MASK;
!   henv.bunsetsugiri_flag = (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) {
--- 1432,1438 ----
        }
    }
    vmask |= WNN_ENV_BUNSETSUGIRI_LEARN_MASK;
!   henv.bunsetsugiri_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) {
***************
*** 1454,1460 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_LAST_IS_FIRST_MASK;      
!   henv.last_is_first_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
  		       vmask,
  		       &henv) < 0) return Qnil;
--- 1454,1460 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_LAST_IS_FIRST_MASK;      
!   henv.last_is_first_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
  		       vmask,
  		       &henv) < 0) return Qnil;
***************
*** 1472,1478 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_COMPLEX_CONV_MASK;
!   henv.complex_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1472,1478 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_COMPLEX_CONV_MASK;
!   henv.complex_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 1490,1496 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_OKURI_LEARN_MASK;
!   henv.okuri_learn_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1490,1496 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_OKURI_LEARN_MASK;
!   henv.okuri_learn_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 1500,1511 ****
  DEFUN ("wnn-server-set-okuri-flag", Fwnn_okuri_flag, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_OKURI_REGULATION &&
--- 1500,1512 ----
  DEFUN ("wnn-server-set-okuri-flag", Fwnn_okuri_flag, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_OKURI_REGULATION &&
***************
*** 1532,1538 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_PREFIX_LEARN_MASK;
!   henv.prefix_learn_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1533,1539 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_PREFIX_LEARN_MASK;
!   henv.prefix_learn_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 1542,1553 ****
  DEFUN ("wnn-server-set-prefix-flag", Fwnn_prefix_flag, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_KANA_KOUHO && mode != WNN_KANJI_KOUHO)
--- 1543,1555 ----
  DEFUN ("wnn-server-set-prefix-flag", Fwnn_prefix_flag, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_KANA_KOUHO && mode != WNN_KANJI_KOUHO)
***************
*** 1572,1578 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_SUFFIX_LEARN_MASK;
!   henv.suffix_learn_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1574,1580 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_SUFFIX_LEARN_MASK;
!   henv.suffix_learn_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 1590,1596 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_COMMON_LAERN_MASK;
!   henv.common_learn_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1592,1598 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_COMMON_LAERN_MASK;
!   henv.common_learn_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 1600,1611 ****
  DEFUN ("wnn-server-set-freq-func-mode", Fwnn_freq_func, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != 0 && mode != 1 && mode != 2 && mode != 3 && mode != 4)
--- 1602,1614 ----
  DEFUN ("wnn-server-set-freq-func-mode", Fwnn_freq_func, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != 0 && mode != 1 && mode != 2 && mode != 3 && mode != 4)
***************
*** 1622,1633 ****
  DEFUN ("wnn-server-set-numeric-mode", Fwnn_numeric, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_NUM_KANSUUJI &&
--- 1625,1637 ----
  DEFUN ("wnn-server-set-numeric-mode", Fwnn_numeric, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_NUM_KANSUUJI &&
***************
*** 1650,1661 ****
  DEFUN ("wnn-server-set-alphabet-mode", Fwnn_alphabet, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_ALP_HAN && mode != WNN_ALP_ZEN)
--- 1654,1666 ----
  DEFUN ("wnn-server-set-alphabet-mode", Fwnn_alphabet, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_ALP_HAN && mode != WNN_ALP_ZEN)
***************
*** 1672,1683 ****
  DEFUN ("wnn-server-set-symbol-mode", Fwnn_symbol, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (mode))
  {
!   int   snum;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (mode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_KIG_HAN && mode != WNN_KIG_JIS && mode != WNN_KIG_ASC)
--- 1677,1689 ----
  DEFUN ("wnn-server-set-symbol-mode", Fwnn_symbol, 1, 1, 0, /*
  For FI-Wnn.
  */
!      (lmode))
  {
!   int   snum, mode;
    unsigned long vmask = 0;
    struct wnn_henkan_env henv;
!   CHECK_INT (lmode);
!   mode = XINT (lmode);
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    if(mode != WNN_KIG_HAN && mode != WNN_KIG_JIS && mode != WNN_KIG_ASC)
***************
*** 1702,1708 ****
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_YURAGI_MASK;
!   henv.yuragi_flag = (mode == Qnil) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
--- 1708,1714 ----
    if ((snum = check_wnn_server_type()) == -1) return Qnil;
    if(!wnnfns_buf[snum]) return Qnil;
    vmask |= WNN_ENV_YURAGI_MASK;
!   henv.yuragi_flag = (EQ(mode, Qnil)) ? False : True;
    if(jl_set_henkan_env(wnnfns_buf[snum],
                         vmask,
                         &henv) < 0) return Qnil;
***************
*** 2065,2074 ****
    /* truncate "(Y/N)" */
    for (len = 0; (mbuf[len]) && (len < 512); len++);
    for (; (mbuf[len] != '(') && (len > 0); len--);
- #if 0
-   if (Fy_or_n_p (make_string (mbuf, len)) == Qnil) return 0;
-   else return (1);
- #else
    {
       Lisp_Object yes, str;
  
--- 2071,2076 ----
***************
*** 2077,2083 ****
       if (NILP (yes)) return 0;
       else return (1);
    }
- #endif
  }
  
  static void
--- 2079,2084 ----
