From 9b763506cdde40b4dd3fedb2d87e3a398e486bc1 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 19 Aug 1993 22:43:36 +0000
Subject: [PATCH] Fix pagination.

---
 v7/src/edwin/comred.scm | 16 +++++++++-------
 v7/src/edwin/kmacro.scm |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/v7/src/edwin/comred.scm b/v7/src/edwin/comred.scm
index de03cb120..63e15a562 100644
--- a/v7/src/edwin/comred.scm
+++ b/v7/src/edwin/comred.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: comred.scm,v 1.103 1993/08/19 05:52:22 jawilson Exp $
+;;;	$Id: comred.scm,v 1.104 1993/08/19 22:43:36 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
@@ -101,12 +101,7 @@
 		 (do () (false)
 		   (reset-command-state!)
 		   (if (queue-empty? command-reader-override-queue)
-		       (let ((input
-			      (if *executing-keyboard-macro?*
-				  (begin
-				    (set! keyboard-keys-read (+ keyboard-keys-read 1))
-				    (keyboard-macro-read-key))
-				  (with-editor-interrupts-disabled keyboard-read))))
+		       (let ((input (get-next-keyboard-char)))
 			 (if (input-event? input)
 			     (apply-input-event input)
 			     (begin
@@ -149,6 +144,13 @@
     (if (not restart) (error "Missing ABORT-EDITOR-COMMAND restart."))
     (invoke-restart restart input)))
 
+(define (get-next-keyboard-char)
+  (if *executing-keyboard-macro?*
+      (begin
+	(set! keyboard-keys-read (+ keyboard-keys-read 1))
+	(keyboard-macro-read-key))
+      (with-editor-interrupts-disabled keyboard-read)))
+
 (define (reset-command-state!)
   (set! *last-command* *command*)
   (set! *command* false)
diff --git a/v7/src/edwin/kmacro.scm b/v7/src/edwin/kmacro.scm
index d81380b10..1027845c7 100644
--- a/v7/src/edwin/kmacro.scm
+++ b/v7/src/edwin/kmacro.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/kmacro.scm,v 1.39 1993/08/19 05:56:15 jawilson Exp $
+;;;	$Id: kmacro.scm,v 1.40 1993/08/19 22:42:14 cph Exp $
 ;;;
-;;;	Copyright (c) 1985, 1989-92 Massachusetts Institute of Technology
+;;;	Copyright (c) 1985, 1989-93 Massachusetts Institute of Technology
 ;;;
 ;;;	This material was developed by the Scheme project at the
 ;;;	Massachusetts Institute of Technology, Department of
-- 
2.25.1