From af7063b5a477e55fb529549c72404a3b4f592fc4 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 2 Aug 1993 22:24:58 +0000
Subject: [PATCH] Change ABORT-CURRENT-COMMAND to EDITOR-ERROR.

---
 v7/src/edwin/prompt.scm | 11 ++++-------
 v7/src/edwin/unix.scm   |  6 ++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/v7/src/edwin/prompt.scm b/v7/src/edwin/prompt.scm
index 56ad46af1..7b7cef80c 100644
--- a/v7/src/edwin/prompt.scm
+++ b/v7/src/edwin/prompt.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: prompt.scm,v 1.158 1993/08/02 03:06:37 cph Exp $
+;;;	$Id: prompt.scm,v 1.159 1993/08/02 22:24:52 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
@@ -815,10 +815,7 @@ Whilst editing the command, the following commands are available:
 (define (prompt-for-confirmed-password)
   (let ((password1 (prompt-for-password "Password: ")))
     (let ((password2 (prompt-for-password "Verify: ")))
-      (if (string=? password1 password2)
-	  password1
-	  (begin
-	    (editor-beep)
-	    (message "Passwords do not match!")
-	    (abort-current-command))))))
+      (if (not (string=? password1 password2))
+	  (editor-error "Passwords do not match!"))
+      password1)))
 
diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index 25ed014c8..7072f210e 100644
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: unix.scm,v 1.36 1993/07/22 19:12:26 cph Exp $
+;;;	$Id: unix.scm,v 1.37 1993/08/02 22:24:58 cph Exp $
 ;;;
 ;;;	Copyright (c) 1989-1993 Massachusetts Institute of Technology
 ;;;
@@ -481,9 +481,7 @@ filename suffix \".KY\"."
      (decrypt the-encrypted-file password
 	      (lambda () 
 		(kill-buffer (mark-buffer mark))
-		(editor-beep)
-		(message "krypt: Password error!")
-		(abort-current-command))
+		(editor-error "krypt: Password error!"))
 	      (lambda (x) 
 		(editor-beep)
 		(message "krypt: Checksum error!")
-- 
2.25.1