From: Arthur Gleckler <edu/mit/csail/zurich/arthur>
Date: Tue, 6 Aug 1991 15:55:10 +0000 (+0000)
Subject: Fix unbound variable error from special key changes.
X-Git-Tag: 20090517-FFI~10405
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7187448c1ecfa6c40af3cb3af83e67697ee35396;p=mit-scheme.git

Fix unbound variable error from special key changes.
---

diff --git a/v7/src/edwin/calias.scm b/v7/src/edwin/calias.scm
index c59f390ae..9072ad66b 100644
--- a/v7/src/edwin/calias.scm
+++ b/v7/src/edwin/calias.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/calias.scm,v 1.10 1991/08/06 15:38:59 arthur Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/calias.scm,v 1.11 1991/08/06 15:55:10 arthur Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -122,7 +122,7 @@
 		(lambda (key)
 		  (emacs-key-name key false))
 		(lambda (key)
-		  (key->name (unmap-alias-key key))))))
+		  (key-name (unmap-alias-key key))))))
        (let loop ((keys (cdr keys)))
 	 (if (null? keys)
 	     ""
diff --git a/v7/src/edwin/iserch.scm b/v7/src/edwin/iserch.scm
index 6ece45c7f..8d2aba5cf 100644
--- a/v7/src/edwin/iserch.scm
+++ b/v7/src/edwin/iserch.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/iserch.scm,v 1.14 1991/08/06 15:39:15 arthur Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/iserch.scm,v 1.15 1991/08/06 15:54:48 arthur Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -120,7 +120,10 @@
 	     (isearch-append-char state char))))))
 
 (define (nonincremental-search forward? regexp?)
-  (cond ((char=? (remap-alias-key (ref-variable search-yank-word-char))
+  (cond ((let ((key (remap-alias-key (ref-variable search-yank-word-char))))
+	   (and (char? key)
+		(char=?
+		 key
 		 (prompt-for-typein
 		  (if regexp?
 		      (prompt-for-string/prompt
@@ -130,7 +133,7 @@
 		       (if forward? "Search" "Search backward")
 		       (write-to-string (ref-variable search-last-string))))
 		  false
-		  (lambda () (keyboard-peek-char))))
+		  (lambda () (keyboard-peek))))))
 	 (if forward?
 	     (ref-command-object word-search-forward)
 	     (ref-command-object word-search-backward)))
diff --git a/v7/src/edwin/prompt.scm b/v7/src/edwin/prompt.scm
index f77b88c28..f28d3135b 100644
--- a/v7/src/edwin/prompt.scm
+++ b/v7/src/edwin/prompt.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/prompt.scm,v 1.147 1991/08/06 15:38:39 arthur Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/prompt.scm,v 1.148 1991/08/06 15:54:57 arthur Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -643,7 +643,7 @@ a repetition of this command will exit."
 		     (let ((command (comtab-entry comtab chars)))
 		       (if (memq command extension-commands)
 			   (inner-loop
-			    (fluid-let ((execute-extended-chars? false))
+			    (fluid-let ((execute-extended-keys? false))
 			      (dispatch-on-command command)))
 			   chars))))))))))))
 
diff --git a/v7/src/edwin/replaz.scm b/v7/src/edwin/replaz.scm
index 5884cf313..4eaf49cc8 100644
--- a/v7/src/edwin/replaz.scm
+++ b/v7/src/edwin/replaz.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/replaz.scm,v 1.71 1991/08/06 15:40:39 arthur Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/replaz.scm,v 1.72 1991/08/06 15:54:41 arthur Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -173,10 +173,11 @@ and \\<n> means insert what matched <n>th \\(...\\) in REGEXP."
 
     (define (perform-query replaced?)
       (message message-string ":")
-      (let ((char (with-editor-interrupts-disabled keyboard-peek-char)))
+      (let ((key (with-editor-interrupts-disabled keyboard-peek)))
 	(let ((test-for
-	       (lambda (char*)
-		 (and (char=? char (remap-alias-key char*))
+	       (lambda (key*)
+		 (and (char? key)
+		      (char=? key (remap-alias-key key*))
 		      (begin
 			(keyboard-read)
 			true)))))