From 80e89e48aba02c9a6d9570566c7346913b685251 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 10 Aug 1993 05:46:42 +0000
Subject: [PATCH] Fix pagination.

---
 v7/src/edwin/buffrm.scm | 17 ++++++-----------
 v7/src/edwin/bufmnu.scm |  8 ++++----
 v7/src/edwin/c-mode.scm | 14 +++++++-------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/v7/src/edwin/buffrm.scm b/v7/src/edwin/buffrm.scm
index 6464f799f..faa7ae930 100644
--- a/v7/src/edwin/buffrm.scm
+++ b/v7/src/edwin/buffrm.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: buffrm.scm,v 1.47 1993/01/09 01:15:52 cph Exp $
+;;;	$Id: buffrm.scm,v 1.48 1993/08/10 05:42:07 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
@@ -366,8 +366,7 @@ Automatically becomes local when set in any fashion."
       (error:wrong-type-argument object "window configuration" procedure)))
 
 (define (screen-window-configuration screen)
-  (if (not (screen? screen))
-      (error:wrong-type-argument screen "screen" 'SCREEN-WINDOW-CONFIGURATION))
+  (guarantee-screen screen 'SCREEN-WINDOW-CONFIGURATION)
   (let ((frame (screen-root-window screen))
 	(converted-windows '()))
     (let ((root-window
@@ -463,8 +462,7 @@ Automatically becomes local when set in any fashion."
 					    (saved-window/point saved-window))
 			(select-buffer-in-window buffer window false)
 			(let ((mark (saved-window/mark saved-window)))
-			  (if mark
-			      (push-buffer-mark! buffer mark)))
+			  (if mark (push-buffer-mark! buffer mark)))
 			(set-window-start-mark!
 			 window
 			 (saved-window/start-mark saved-window)
@@ -480,21 +478,18 @@ Automatically becomes local when set in any fashion."
 	  (let ((convert-window
 		 (lambda (saved-window)
 		   (let ((association (assq saved-window converted-windows)))
-		     (and association
-			  (cdr association))))))
+		     (and association (cdr association))))))
 	    (let ((window
 		   (window-configuration/selected-window configuration)))
 	      (if window
 		  (let ((window (convert-window window)))
 		    (without-interrupts
-		     (lambda ()
-		       (screen-select-window! screen window))))))
+		     (lambda () (screen-select-window! screen window))))))
 	    (let ((window (window-configuration/cursor-window configuration)))
 	      (if window
 		  (let ((window (convert-window window)))
 		    (without-interrupts
-		     (lambda ()
-		       (screen-select-cursor! screen window))))))
+		     (lambda () (screen-select-cursor! screen window))))))
 	    (let ((window
 		   (window-configuration/minibuffer-scroll-window
 		    configuration)))
diff --git a/v7/src/edwin/bufmnu.scm b/v7/src/edwin/bufmnu.scm
index e44fdf80e..90074b4b9 100644
--- a/v7/src/edwin/bufmnu.scm
+++ b/v7/src/edwin/bufmnu.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: bufmnu.scm,v 1.124 1992/11/17 17:37:28 cph Exp $
+;;;	$Id: bufmnu.scm,v 1.125 1993/08/10 05:43:07 cph Exp $
 ;;;
-;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
+;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
 ;;;	This material was developed by the Scheme project at the
 ;;;	Massachusetts Institute of Technology, Department of
@@ -298,14 +298,14 @@ and then move up one line."
   "p"
   (lambda (argument)
     (set-current-point! (line-start (current-point) argument 'BEEP))))
-
+
 (define-command buffer-menu-abort
   "Abort buffer menu edit."
   ()
   (lambda ()
     (kill-buffer-interactive (current-buffer))
     (clear-message)))
-
+
 (define (buffer-menu-select menu buffer needed?)
   (select-buffer buffer)
   (if (not (or (eq? menu buffer) needed?))
diff --git a/v7/src/edwin/c-mode.scm b/v7/src/edwin/c-mode.scm
index 536430434..3e981a638 100644
--- a/v7/src/edwin/c-mode.scm
+++ b/v7/src/edwin/c-mode.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: c-mode.scm,v 1.51 1992/11/17 17:37:47 cph Exp $
+;;;	$Id: c-mode.scm,v 1.52 1993/08/10 05:46:42 cph Exp $
 ;;;
-;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
+;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
 ;;;
 ;;;	This material was developed by the Scheme project at the
 ;;;	Massachusetts Institute of Technology, Department of
@@ -46,11 +46,6 @@
 
 (declare (usual-integrations))
 
-(define-command c-mode
-  "Enter C mode."
-  ()
-  (lambda () (set-current-major-mode! (ref-mode-object c))))
-
 (define-major-mode c fundamental "C"
   "Major mode for editing C code.
 Expression and list commands understand all C brackets.
@@ -129,6 +124,11 @@ Settings for K&R and BSD indentation styles are
       c-mode:comment-indent)
     (event-distributor/invoke! (ref-variable c-mode-hook buffer) buffer)))
 
+(define-command c-mode
+  "Enter C mode."
+  ()
+  (lambda () (set-current-major-mode! (ref-mode-object c))))
+
 (define-variable c-mode-hook
   "An event distributor that is invoked when entering C mode."
   (make-event-distributor))
-- 
2.25.1