From xemacs-m  Sun Jun 15 16:07:26 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id QAA26788
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 16:07:24 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id OAA09145;
	Sun, 15 Jun 1997 14:07:34 -0700
Date: Sun, 15 Jun 1997 14:07:34 -0700
Message-Id: <199706152107.OAA09145@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: "Karl M. Hegbloom" <karlheg@inetarena.com>
Cc: <xemacs-beta@xemacs.org>
Subject: Re: [patch] egg/{egg,egg-{jisx0201,quail,sj3-client,sj3,wnn}}
In-Reply-To: <199706152005.NAA08360@bittersweet.inetarena.com>
References: <199706152005.NAA08360@bittersweet.inetarena.com>
X-Mailer: VM 6.32 under 20.3 "Oslo" XEmacs Lucid (beta7)
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D

 And another... <sigh>

8<----------------------------------------------------------------->8
*** egg-jisx0201.el.orig	Sun Jun 15 13:00:36 1997
--- egg-jisx0201.el	Sun Jun 15 14:06:26 1997
***************
*** 142,148 ****
      (goto-char (point-min))
      (let ((regexp (if arg "\\cS\\|\\cK\\|\\cH" "\\cS\\|\\cK")))
        (while (re-search-forward regexp (point-max) (point-max))
! 	(let* ((ch (preceding-char))
  	       (ch1 (char-octet ch 0))
  	       (ch2 (char-octet ch 1)))
  	  (cond ((= ?\241 ch1)
--- 142,148 ----
      (goto-char (point-min))
      (let ((regexp (if arg "\\cS\\|\\cK\\|\\cH" "\\cS\\|\\cK")))
        (while (re-search-forward regexp (point-max) (point-max))
! 	(let* ((ch (char-before (point)))
  	       (ch1 (char-octet ch 0))
  	       (ch2 (char-octet ch 1)))
  	  (cond ((= ?\241 ch1)
***************
*** 202,214 ****
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "\\ck" (point-max) (point-max))
!       (let ((ch (preceding-char))
  	    (wk nil))
  	(cond
  	 ((= ch ?(I^(B)
  	  (save-excursion
  	    (backward-char 1)
! 	    (setq wk (preceding-char)))
  	  (cond ((= wk ?$B%&(B)
  		 (delete-char -2)
  		 (insert "$B%t(B"))
--- 202,214 ----
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "\\ck" (point-max) (point-max))
!       (let ((ch (char-before (point)))
  	    (wk nil))
  	(cond
  	 ((= ch ?(I^(B)
  	  (save-excursion
  	    (backward-char 1)
! 	    (setq wk (char-before (point))))
  	  (cond ((= wk ?$B%&(B)
  		 (delete-char -2)
  		 (insert "$B%t(B"))
***************
*** 221,227 ****
  	 ((= ch ?(I_(B)
  	  (save-excursion
  	    (backward-char 1)
! 	    (setq wk (preceding-char)))
  	  (if (setq wk (memq wk *handakuon-list*))
  	      (progn
  		(delete-char -2)
--- 221,227 ----
  	 ((= ch ?(I_(B)
  	  (save-excursion
  	    (backward-char 1)
! 	    (setq wk (char-before (point))))
  	  (if (setq wk (memq wk *handakuon-list*))
  	      (progn
  		(delete-char -2)
*** egg-quail.el.orig	Sun Jun 15 13:00:47 1997
--- egg-quail.el	Sun Jun 15 13:03:59 1997
***************
*** 44,50 ****
    (if quail-henkan-start
        (let ((pos (point-marker)))
  	(goto-char quail-henkan-start)
! 	(if (and (= (following-char) quail-henkan-start-char)
  		 (progn (delete-char 1)
  			(< quail-henkan-start pos)))
  	    (let ((henkan-mode-map quail-henkan-mode-map))
--- 44,50 ----
    (if quail-henkan-start
        (let ((pos (point-marker)))
  	(goto-char quail-henkan-start)
! 	(if (and (= (char-after (point)) quail-henkan-start-char)
  		 (progn (delete-char 1)
  			(< quail-henkan-start pos)))
  	    (let ((henkan-mode-map quail-henkan-mode-map))
*** egg-sj3-client.el.orig	Sun Jun 15 13:01:03 1997
--- egg-sj3-client.el	Sun Jun 15 13:04:08 1997
***************
*** 995,1001 ****
        (sj3-result-goto-bunsetu bunsetu-no)
        (sj3-skip-length)
        (let ((c 0) ch)
! 	(while (not (zerop (setq ch (following-char))))
  	  (if (= ch lc-jp)
  	      (forward-char 3)
  	    (forward-char 1))
--- 995,1001 ----
        (sj3-result-goto-bunsetu bunsetu-no)
        (sj3-skip-length)
        (let ((c 0) ch)
! 	(while (not (zerop (setq ch (char-after (point)))))
  	  (if (= ch lc-jp)
  	      (forward-char 3)
  	    (forward-char 1))
*** egg-sj3.el.orig	Sun Jun 15 13:01:22 1997
--- egg-sj3.el	Sun Jun 15 13:04:23 1997
***************
*** 1304,1317 ****
  (defun diced-delete ()
    (interactive)
    (beginning-of-line)
!   (if (= (following-char) ?  )
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert "D") (backward-char 1))))
      
  (defun diced-undelete ()
    (interactive)
    (beginning-of-line)
!   (if (= (following-char) ?D)
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert " ") (backward-char 1))
      (beep)))
--- 1304,1317 ----
  (defun diced-delete ()
    (interactive)
    (beginning-of-line)
!   (if (= (char-after (point)) ?  )
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert "D") (backward-char 1))))
      
  (defun diced-undelete ()
    (interactive)
    (beginning-of-line)
!   (if (= (char-after (point)) ?D)
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert " ") (backward-char 1))
      (beep)))
***************
*** 1330,1336 ****
    (goto-char (point-min))
    (let ((no  0))
      (while (not (eobp))
!       (if (= (following-char) ?D)
  	  (let* ((dict-item (nth no *diced-dict-info*))
  		 (yomi (nth 0 dict-item))
  		 (kanji (nth 1 dict-item))
--- 1330,1336 ----
    (goto-char (point-min))
    (let ((no  0))
      (while (not (eobp))
!       (if (= (char-after (point)) ?D)
  	  (let* ((dict-item (nth no *diced-dict-info*))
  		 (yomi (nth 0 dict-item))
  		 (kanji (nth 1 dict-item))
*** egg-wnn.el.orig	Sun Jun 15 13:01:57 1997
--- egg-wnn.el	Sun Jun 15 13:04:32 1997
***************
*** 1811,1817 ****
    (beginning-of-line)
    (if (= (char-after (1+ (point))) ?* )
        (progn (message (egg:msg-get 'cannot-remove)) (beep))
!     (if (= (following-char) ?  )
  	(let ((buffer-read-only nil))
  	  (delete-char 1) (insert "D") (backward-char 1))
        )))
--- 1811,1817 ----
    (beginning-of-line)
    (if (= (char-after (1+ (point))) ?* )
        (progn (message (egg:msg-get 'cannot-remove)) (beep))
!     (if (= (char-after (point)) ?  )
  	(let ((buffer-read-only nil))
  	  (delete-char 1) (insert "D") (backward-char 1))
        )))
***************
*** 1820,1826 ****
  (defun diced-undelete ()
    (interactive)
    (beginning-of-line)
!   (if (= (following-char) ?D)
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert " ") (backward-char 1))
      (beep)))
--- 1820,1826 ----
  (defun diced-undelete ()
    (interactive)
    (beginning-of-line)
!   (if (= (char-after (point)) ?D)
        (let ((buffer-read-only nil))
  	(delete-char 1) (insert " ") (backward-char 1))
      (beep)))
***************
*** 1883,1889 ****
    (goto-char (point-min))
    (let ((no  0))
      (while (not (eobp))
!       (if (= (following-char) ?D)
  	  (let* ((dict-item (nth no *diced-dict-info*))
  		 (kanji (nth 0 dict-item))
  		 (bunpo (nth 1 dict-item))
--- 1883,1889 ----
    (goto-char (point-min))
    (let ((no  0))
      (while (not (eobp))
!       (if (= (char-after (point)) ?D)
  	  (let* ((dict-item (nth no *diced-dict-info*))
  		 (kanji (nth 0 dict-item))
  		 (bunpo (nth 1 dict-item))
*** egg.el.orig	Sun Jun 15 13:02:07 1997
--- egg.el	Sun Jun 15 13:04:40 1997
***************
*** 862,868 ****
    (interactive "r")
      (goto-char start)
      (while (re-search-forward kanji-katakana end end)
!       (let ((ch (preceding-char)))
  	(cond( (<= ch ?$B%s(B)
  	       (delete-char -1)
  	       (insert (make-char (find-charset 'japanese-jisx0208) 36 (char-octet ch 1))))))))
--- 862,868 ----
    (interactive "r")
      (goto-char start)
      (while (re-search-forward kanji-katakana end end)
!       (let ((ch (char-before (point))))
  	(cond( (<= ch ?$B%s(B)
  	       (delete-char -1)
  	       (insert (make-char (find-charset 'japanese-jisx0208) 36 (char-octet ch 1))))))))
***************
*** 893,899 ****
    (interactive "r")
    (goto-char start)
    (while (re-search-forward kanji-hiragana end end)
!     (let ((ch (char-octet (preceding-char) 1)))
        (delete-char -1)
        (insert (make-char (find-charset 'japanese-jisx0208) 37 ch)))))
  
--- 893,899 ----
    (interactive "r")
    (goto-char start)
    (while (re-search-forward kanji-hiragana end end)
!     (let ((ch (char-octet (char-before (point)) 1)))
        (delete-char -1)
        (insert (make-char (find-charset 'japanese-jisx0208) 37 ch)))))
  
***************
*** 925,931 ****
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "\\cS\\|\\cA" (point-max) (point-max))
!       (let* ((ch (preceding-char))
  	     (ch1 (char-octet ch 0))
  	     (ch2 (char-octet ch 1)))
  	(cond ((= ?\241 ch1)
--- 925,931 ----
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "\\cS\\|\\cA" (point-max) (point-max))
!       (let* ((ch (char-before (point)))
  	     (ch1 (char-octet ch 0))
  	     (ch2 (char-octet ch 1)))
  	(cond ((= ?\241 ch1)
***************
*** 1007,1013 ****
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "[ -~]" (point-max) (point-max))
!       (let ((ch (preceding-char)))
  	(if (and (<= ?  ch) (<= ch ?~))
  	    (progn
  	      (delete-char -1)
--- 1007,1013 ----
      (narrow-to-region start end)
      (goto-char (point-min))
      (while (re-search-forward "[ -~]" (point-max) (point-max))
!       (let ((ch (char-before (point))))
  	(if (and (<= ?  ch) (<= ch ?~))
  	    (progn
  	      (delete-char -1)
***************
*** 1595,1601 ****
  		  ch)
  	      nil))
  	nil)
!     (following-char)))
  
  (defun its:read-char ()
    (if (= (point) its:*buff-e*)
--- 1595,1601 ----
  		  ch)
  	      nil))
  	nil)
!     (char-after (point))))
  
  (defun its:read-char ()
    (if (= (point) its:*buff-e*)
***************
*** 1604,1610 ****
  	(if its:*interactive*
  	    (egg-read-event)
  	  nil))
!     (let ((ch (following-char)))
        (setq its:*char-from-buff* t)
        (delete-char 1)
        ch)))
--- 1604,1610 ----
  	(if its:*interactive*
  	    (egg-read-event)
  	  nil))
!     (let ((ch (char-after (point))))
        (setq its:*char-from-buff* t)
        (delete-char 1)
        ch)))
8<----------------------------------------------------------------->8

-- 
Karl M. Hegbloom <karlheg@inetarena.com>
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3  Linux 2.1.36 AMD K5 PR-133

