From 5a7fa821eed8ae83863eced931689da70de616d4 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 24 Apr 1991 00:38:05 +0000 Subject: [PATCH] Eliminate reference to `match-string'. --- v7/src/edwin/kilcom.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/v7/src/edwin/kilcom.scm b/v7/src/edwin/kilcom.scm index ab95a8267..eb9f40270 100644 --- a/v7/src/edwin/kilcom.scm +++ b/v7/src/edwin/kilcom.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/kilcom.scm,v 1.60 1991/04/21 00:51:04 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/kilcom.scm,v 1.61 1991/04/24 00:38:05 cph Exp $ ;;; ;;; Copyright (c) 1985, 1989-91 Massachusetts Institute of Technology ;;; @@ -258,12 +258,18 @@ but the region must still match the last killed stuff." (let ((ring (current-kill-ring)) (point (current-point))) (if (or (ring-empty? ring) - (not (match-string (ring-ref ring 0) (current-mark) point))) + (not + (let ((string (ring-ref ring 0)) + (mark (current-mark))) + (if (mark< mark point) + (match-forward string mark point false) + (match-forward string point mark false))))) (editor-error "Region does not match last kill")) (delete-string (pop-current-mark!) point) (if (not (zero? argument)) - (begin (ring-pop! ring) - (unkill-reversed (ring-ref ring 0)))))) + (begin + (ring-pop! ring) + (unkill-reversed (ring-ref ring 0)))))) (lambda () (editor-error "No previous un-kill to replace"))) (set-command-message! un-kill-tag))) -- 2.25.1