From xemacs-m  Sun Jun 15 15:13:44 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 PAA20127
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 15:13:41 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id NAA08406;
	Sun, 15 Jun 1997 13:13:56 -0700
Date: Sun, 15 Jun 1997 13:13:56 -0700
Message-Id: <199706152013.NAA08406@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
To: <xemacs-beta@xemacs.org>
Subject: [patch] emulators/{edt,tpu-edt}.el
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


8<----------------------------------------------------------------->8
*** edt.el.orig	Sun Jun 15 13:12:07 1997
--- edt.el	Sun Jun 15 13:12:48 1997
***************
*** 275,293 ****
    (if (eolp)
        (forward-char)
        (progn
!         (if (memq (following-char) edt-word-entities)
              (forward-char)
              (while (and 
                       (not (eolp))
                       (not (eobp))
!                      (not (eq ?\  (char-syntax (following-char))))
!                      (not (memq (following-char) edt-word-entities)))
                (forward-char)))
          (while (and 
                   (not (eolp))
                   (not (eobp))
!                  (eq ?\  (char-syntax (following-char)))
!                  (not (memq (following-char) edt-word-entities)))
            (forward-char)))))
  
  (defun edt-one-word-backward ()
--- 275,293 ----
    (if (eolp)
        (forward-char)
        (progn
!         (if (memq (char-after (point)) edt-word-entities)
              (forward-char)
              (while (and 
                       (not (eolp))
                       (not (eobp))
!                      (not (eq ?\  (char-syntax (char-after (point)))))
!                      (not (memq (char-after (point)) edt-word-entities)))
                (forward-char)))
          (while (and 
                   (not (eolp))
                   (not (eobp))
!                  (eq ?\  (char-syntax (char-after (point))))
!                  (not (memq (char-after (point)) edt-word-entities)))
            (forward-char)))))
  
  (defun edt-one-word-backward ()
***************
*** 302,316 ****
          (while (and 
                   (not (bolp))
                   (not (bobp))
!                  (eq ?\  (char-syntax (following-char)))
!                  (not (memq (following-char) edt-word-entities)))
            (backward-char))
!         (if (not (memq (following-char) edt-word-entities))
              (while (and 
                       (not (bolp))
                       (not (bobp))
!                      (not (eq ?\  (char-syntax (preceding-char))))
!                      (not (memq (preceding-char) edt-word-entities)))
                (backward-char))))))
  
  (defun edt-word-forward (num)
--- 302,316 ----
          (while (and 
                   (not (bolp))
                   (not (bobp))
!                  (eq ?\  (char-syntax (char-after (point))))
!                  (not (memq (char-after (point)) edt-word-entities)))
            (backward-char))
!         (if (not (memq (char-after (point)) edt-word-entities))
              (while (and 
                       (not (bolp))
                       (not (bobp))
!                      (not (eq ?\  (char-syntax (char-before (point)))))
!                      (not (memq (char-before (point)) edt-word-entities)))
                (backward-char))))))
  
  (defun edt-word-forward (num)
***************
*** 478,484 ****
    (edt-check-prefix num)
    (let ((beg (point)))
      (forward-line num)
!     (if (not (eq (preceding-char) ?\n))
          (insert "\n"))
      (setq edt-last-deleted-lines
            (buffer-substring beg (point)))
--- 478,484 ----
    (edt-check-prefix num)
    (let ((beg (point)))
      (forward-line num)
!     (if (not (eq (char-before (point)) ?\n))
          (insert "\n"))
      (setq edt-last-deleted-lines
            (buffer-substring beg (point)))
***************
*** 702,708 ****
              (point-save (point)))
          (goto-char (min (point) (mark)))
          (while (not (eq (point) end))
!           (funcall (if (<= ?a (following-char))
                         'upcase-region 'downcase-region)
                     (point) (1+ (point)))
            (forward-char 1))
--- 702,708 ----
              (point-save (point)))
          (goto-char (min (point) (mark)))
          (while (not (eq (point) end))
!           (funcall (if (<= ?a (char-after (point)))
                         'upcase-region 'downcase-region)
                     (point) (1+ (point)))
            (forward-char 1))
***************
*** 711,717 ****
          (if (string= edt-direction-string edt-backward-string)
              (backward-char num))
          (while (> num 0)
!           (funcall (if (<= ?a (following-char))
                         'upcase-region 'downcase-region)
                     (point) (1+ (point)))
            (forward-char 1)
--- 711,717 ----
          (if (string= edt-direction-string edt-backward-string)
              (backward-char num))
          (while (> num 0)
!           (funcall (if (<= ?a (char-after (point)))
                         'upcase-region 'downcase-region)
                     (point) (1+ (point)))
            (forward-char 1)
***************
*** 1134,1140 ****
      (if (and (not (equal start (point)))
               (not (eolp)))
          (progn
!           (if (and (equal ?\t (preceding-char))
                     (< start-column (current-column)))
                (backward-char))
            (let ((beg (point)))
--- 1134,1140 ----
      (if (and (not (equal start (point)))
               (not (eolp)))
          (progn
!           (if (and (equal ?\t (char-before (point)))
                     (< start-column (current-column)))
                (backward-char))
            (let ((beg (point)))
***************
*** 1349,1357 ****
  	      (not (eobp))
  	      (not (bolp))
  	      (not (eolp))
! 	      (not (eq ?\  (char-syntax (preceding-char))))
! 	      (not (memq (preceding-char) edt-word-entities))
! 	      (not (memq (following-char) edt-word-entities)))
  	    (edt-one-word-backward))
  	(if (equal edt-direction-string edt-backward-string)
  	    (edt-one-word-backward))
--- 1349,1357 ----
  	      (not (eobp))
  	      (not (bolp))
  	      (not (eolp))
! 	      (not (eq ?\  (char-syntax (char-before (point)))))
! 	      (not (memq (char-before (point)) edt-word-entities))
! 	      (not (memq (char-after (point)) edt-word-entities)))
  	    (edt-one-word-backward))
  	(if (equal edt-direction-string edt-backward-string)
  	    (edt-one-word-backward))
***************
*** 1385,1393 ****
  	      (not (eobp))
  	      (not (bolp))
  	      (not (eolp))
! 	      (not (eq ?\  (char-syntax (preceding-char))))
! 	      (not (memq (preceding-char) edt-word-entities))
! 	      (not (memq (following-char) edt-word-entities)))
  	    (edt-one-word-backward))
  	(if (equal edt-direction-string edt-backward-string)
  	    (edt-one-word-backward))
--- 1385,1393 ----
  	      (not (eobp))
  	      (not (bolp))
  	      (not (eolp))
! 	      (not (eq ?\  (char-syntax (char-before (point)))))
! 	      (not (memq (char-before (point)) edt-word-entities))
! 	      (not (memq (char-after (point)) edt-word-entities)))
  	    (edt-one-word-backward))
  	(if (equal edt-direction-string edt-backward-string)
  	    (edt-one-word-backward))
*** tpu-edt.el.orig	Sun Jun 15 13:12:40 1997
--- tpu-edt.el	Sun Jun 15 13:13:04 1997
***************
*** 651,657 ****
  	   (tpu-unset-match)))
  	(t
  	 (while (> num 0)
! 	   (funcall (if (= (downcase (following-char)) (following-char))
  			'upcase-region 'downcase-region)
  		    (point) (1+ (point)))
  	   (forward-char (if tpu-reverse -1 1))
--- 651,657 ----
  	   (tpu-unset-match)))
  	(t
  	 (while (> num 0)
! 	   (funcall (if (= (downcase (char-after (point))) (char-after (point)))
  			'upcase-region 'downcase-region)
  		    (point) (1+ (point)))
  	   (forward-char (if tpu-reverse -1 1))
***************
*** 1420,1426 ****
    (setq zmacs-region-stays t)
    (let ((beg (point)))
      (forward-line num)
!     (if (not (eq (preceding-char) ?\n))
          (insert "\n"))
      (setq tpu-last-deleted-lines
            (buffer-substring beg (point)))
--- 1420,1426 ----
    (setq zmacs-region-stays t)
    (let ((beg (point)))
      (forward-line num)
!     (if (not (eq (char-before (point)) ?\n))
          (insert "\n"))
      (setq tpu-last-deleted-lines
            (buffer-substring beg (point)))
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

