From 72483958e66337b0e0b754c7b4df3c36ae500c9c Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 10 Aug 1993 06:50:48 +0000
Subject: [PATCH] Fix pagination.
---
v7/src/edwin/dosshell.scm | 4 ++--
v7/src/edwin/edtstr.scm | 8 +++++---
v7/src/edwin/filcom.scm | 7 +++----
v7/src/edwin/fileio.scm | 5 +++--
v7/src/edwin/info.scm | 10 +++++-----
v7/src/edwin/iserch.scm | 6 +++---
v7/src/edwin/loadef.scm | 6 +++---
v7/src/edwin/macros.scm | 27 +++------------------------
v7/src/edwin/modlin.scm | 7 ++++---
v7/src/edwin/motcom.scm | 8 ++++----
v7/src/edwin/notify.scm | 6 +++---
11 files changed, 38 insertions(+), 56 deletions(-)
diff --git a/v7/src/edwin/dosshell.scm b/v7/src/edwin/dosshell.scm
index d7dced687..b250c0290 100644
--- a/v7/src/edwin/dosshell.scm
+++ b/v7/src/edwin/dosshell.scm
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: dosshell.scm,v 1.2 1993/02/25 02:56:29 gjr Exp $
+$Id: dosshell.scm,v 1.3 1993/08/10 06:38:22 cph Exp $
Copyright (c) 1992-1993 Massachusetts Institute of Technology
@@ -94,7 +94,7 @@ Customization: Entry to this mode runs the hook pseudo-shell-mode-hook."
;; (define-key 'pseudo-shell #\tab 'comint-dynamic-complete)
;; (define-key 'pseudo-shell #\M-? 'comint-dynamic-list-completions)
-
+
(define-command shell
"Run an inferior pseudo shell, with I/O through buffer *shell*.
With prefix argument, unconditionally create a new buffer.
diff --git a/v7/src/edwin/edtstr.scm b/v7/src/edwin/edtstr.scm
index 406bb7a9d..d30bedd39 100644
--- a/v7/src/edwin/edtstr.scm
+++ b/v7/src/edwin/edtstr.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/edtstr.scm,v 1.21 1992/02/13 23:35:07 cph Exp $
+;;; $Id: edtstr.scm,v 1.22 1993/08/10 06:39:51 cph Exp $
;;;
-;;; Copyright (c) 1989-92 Massachusetts Institute of Technology
+;;; Copyright (c) 1989-93 Massachusetts Institute of Technology
;;;
;;; This material was developed by the Scheme project at the
;;; Massachusetts Institute of Technology, Department of
@@ -104,6 +104,8 @@
(set-editor-select-time! current-editor (1+ time))
time))
+;;;; Buttons
+
(define-structure (button-event (conc-name button-event/))
(window false read-only true)
(x false read-only true)
@@ -132,7 +134,7 @@
(define button-record-type
(make-record-type 'BUTTON '(NUMBER DOWN?)))
-
+
(define make-down-button)
(define make-up-button)
(let ((%make-button
diff --git a/v7/src/edwin/filcom.scm b/v7/src/edwin/filcom.scm
index 86a54c042..726e2d109 100644
--- a/v7/src/edwin/filcom.scm
+++ b/v7/src/edwin/filcom.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: filcom.scm,v 1.174 1993/01/12 10:45:46 cph Exp $
+;;; $Id: filcom.scm,v 1.175 1993/08/10 06:40:36 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
@@ -734,5 +734,4 @@ If a file with the new name already exists, confirmation is requested first."
(sort filenames string<?))
(define-integrable (completion-ignore-filename? filename)
- (os/completion-ignore-filename? filename))
-
+ (os/completion-ignore-filename? filename))
\ No newline at end of file
diff --git a/v7/src/edwin/fileio.scm b/v7/src/edwin/fileio.scm
index 1ad9e3694..110f2248a 100644
--- a/v7/src/edwin/fileio.scm
+++ b/v7/src/edwin/fileio.scm
@@ -1,6 +1,6 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: fileio.scm,v 1.117 1993/04/27 09:18:34 cph Exp $
+;;; $Id: fileio.scm,v 1.118 1993/08/10 06:41:16 cph Exp $
;;;
;;; Copyright (c) 1986, 1989-1993 Massachusetts Institute of Technology
;;;
@@ -774,7 +774,8 @@ Otherwise, a message is written both before and after long file writes."
old 1 olen))))
(let ((end (fix:+ end delta)))
(replace! next)
- (loop (group-find-next-char group (fix:+ next* delta) end match)
+ (loop (group-find-next-char group (fix:+ next* delta) end
+ match)
end))
(loop (group-find-next-char group next* end match)
end))))))))
\ No newline at end of file
diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm
index 68ef077fc..b20142c31 100644
--- a/v7/src/edwin/info.scm
+++ b/v7/src/edwin/info.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: info.scm,v 1.115 1992/11/17 17:38:34 cph Exp $
+;;; $Id: info.scm,v 1.116 1993/08/10 06:43:44 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
@@ -683,7 +683,8 @@ The name may be an abbreviation of the reference name."
(ref-variable info-current-node)
(mark-index (current-point))))
;; Switch files if necessary.
- (if (and pathname (not (equal? pathname (ref-variable info-current-file))))
+ (if (and pathname
+ (not (equal? pathname (ref-variable info-current-file))))
(begin
(read-buffer buffer pathname true)
(if (not (eq? (buffer-major-mode buffer) (ref-mode-object info)))
@@ -705,8 +706,7 @@ The name may be an abbreviation of the reference name."
(let ((end (buffer-end buffer)))
(let loop ((start (node-search-start nodename)))
(let ((node (next-node start end)))
- (if (not node)
- (editor-error "No such node: " nodename))
+ (if (not node) (editor-error "No such node: " nodename))
(if (let ((name (extract-node-name node)))
(and name
(string-ci=? nodename name)))
diff --git a/v7/src/edwin/iserch.scm b/v7/src/edwin/iserch.scm
index 9b7fdb7a2..55819a165 100644
--- a/v7/src/edwin/iserch.scm
+++ b/v7/src/edwin/iserch.scm
@@ -1,6 +1,6 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: iserch.scm,v 1.18 1993/08/02 03:06:35 cph Exp $
+;;; $Id: iserch.scm,v 1.19 1993/08/10 06:45:05 cph Exp $
;;;
;;; Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
;;;
@@ -194,7 +194,7 @@
(define (extract-rest-of-line mark)
(extract-string mark (line-end mark (if (line-end? mark) 1 0) 'LIMIT)))
-
+
(define (search-state-message state)
(let ((invalid-regexp (search-state-invalid-regexp state)))
(let ((m
@@ -209,7 +209,7 @@
(if invalid-regexp (string-append " [" invalid-regexp "]") ""))))
(string-set! m 0 (char-upcase (string-ref m 0)))
m)))
-
+
(define (search-state-append-string state string)
(let ((text (string-append (search-state-text state) string)))
(if (search-state-successful? state)
diff --git a/v7/src/edwin/loadef.scm b/v7/src/edwin/loadef.scm
index d861ad76f..639f2622c 100644
--- a/v7/src/edwin/loadef.scm
+++ b/v7/src/edwin/loadef.scm
@@ -1,6 +1,6 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: loadef.scm,v 1.22 1993/08/02 21:05:52 cph Exp $
+;;; $Id: loadef.scm,v 1.23 1993/08/10 06:45:55 cph Exp $
;;;
;;; Copyright (c) 1986, 1989-1993 Massachusetts Institute of Technology
;;;
@@ -72,8 +72,8 @@
(define-library 'RMAIL-SUMMARY-MODE
'("rmailsum" (EDWIN RMAIL)))
-(define-autoload-major-mode 'rmail-summary 'fundamental "RMAIL-Summary" 'RMAIL-SUMMARY-MODE
- "Summary mode for RMAIL.")
+(define-autoload-major-mode 'rmail-summary 'fundamental "RMAIL-Summary"
+ 'RMAIL-SUMMARY-MODE "Summary mode for RMAIL.")
(define-autoload-command 'rmail-summary 'RMAIL-SUMMARY-MODE
"Enter RMAIL Summary mode.")
diff --git a/v7/src/edwin/macros.scm b/v7/src/edwin/macros.scm
index ec0d6772d..bf2b91da1 100644
--- a/v7/src/edwin/macros.scm
+++ b/v7/src/edwin/macros.scm
@@ -1,6 +1,6 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: macros.scm,v 1.59 1993/01/09 01:16:15 cph Exp $
+;;; $Id: macros.scm,v 1.60 1993/08/10 06:47:41 cph Exp $
;;;
;;; Copyright (c) 1986, 1989-1993 Massachusetts Institute of Technology
;;;
@@ -125,7 +125,7 @@
(define (command-name->scheme-name name)
(symbol-append 'EDWIN-COMMAND$ name))
-
+
(let ((variable-definition
(lambda (buffer-local?)
(lambda (name description #!optional value test)
@@ -227,25 +227,4 @@
(define (canonicalize-name name)
(cond ((symbol? name) name)
((string? name) (intern (string-replace name #\Space #\-)))
- (else (error "illegal name" name))))
-
-(syntax-table-define edwin-syntax-table 'VALUES-LET
- (lambda (bindings . forms)
-
- (define (transform/binding binding forms)
- (if (or (not (pair? binding))
- (not (pair? (cdr binding))))
- (error "values-let: bad binding clause" binding))
- `(WITH-VALUES (LAMBDA () ,(cadr binding))
- (LAMBDA (,@(car binding)) ,@forms)))
-
- (define (transform/values-let bindings forms)
- (transform/binding
- (car bindings)
- (if (null? (cdr bindings))
- forms
- (list (transform/values-let (cdr bindings) forms)))))
-
- (if (not (pair? bindings))
- (error "values-let: missing bindings" (cons bindings forms))
- (transform/values-let bindings forms))))
\ No newline at end of file
+ (else (error "illegal name" name))))
\ No newline at end of file
diff --git a/v7/src/edwin/modlin.scm b/v7/src/edwin/modlin.scm
index b4cc3563f..53c38b3a3 100644
--- a/v7/src/edwin/modlin.scm
+++ b/v7/src/edwin/modlin.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: modlin.scm,v 1.15 1992/11/12 18:00:37 cph Exp $
+;;; $Id: modlin.scm,v 1.16 1993/08/10 06:48:48 cph Exp $
;;;
-;;; Copyright (c) 1989-92 Massachusetts Institute of Technology
+;;; Copyright (c) 1989-93 Massachusetts Institute of Technology
;;;
;;; This material was developed by the Scheme project at the
;;; Massachusetts Institute of Technology, Department of
@@ -291,7 +291,8 @@ If #F, the normal method is used."
(min
(let ((start (group-display-start-index group)))
(integer-round
- (* 100 (- (mark-index (window-start-mark window)) start))
+ (* 100
+ (- (mark-index (window-start-mark window)) start))
(- (group-display-end-index group) start)))
99))
2)
diff --git a/v7/src/edwin/motcom.scm b/v7/src/edwin/motcom.scm
index 3436d0ced..f80861e9a 100644
--- a/v7/src/edwin/motcom.scm
+++ b/v7/src/edwin/motcom.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/motcom.scm,v 1.45 1991/11/21 10:37:39 cph Exp $
+;;; $Id: motcom.scm,v 1.46 1993/08/10 06:49:52 cph Exp $
;;;
-;;; Copyright (c) 1985, 1989-91 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
@@ -173,8 +173,8 @@ Continuation lines are skipped."
(move-to-column (line-start (current-point) (- argument) 'FAILURE)
column)))
(set-command-message! temporary-goal-column-tag column))))
-
-;;; Jokes
+
+;;;; Jokes
(define-command hyper-space
"Engage warp drive."
diff --git a/v7/src/edwin/notify.scm b/v7/src/edwin/notify.scm
index 7530a9112..5dbaabb03 100644
--- a/v7/src/edwin/notify.scm
+++ b/v7/src/edwin/notify.scm
@@ -1,8 +1,8 @@
;;; -*-Scheme-*-
;;;
-;;; $Id: notify.scm,v 1.10 1992/09/17 00:26:15 jinx Exp $
+;;; $Id: notify.scm,v 1.11 1993/08/10 06:50:48 cph Exp $
;;;
-;;; Copyright (c) 1992 Massachusetts Institute of Technology
+;;; Copyright (c) 1992-93 Massachusetts Institute of Technology
;;;
;;; This material was developed by the Scheme project at the
;;; Massachusetts Institute of Technology, Department of
@@ -98,7 +98,7 @@
"")))
(kill-buffer temporary-buffer)
result))))
-
+
(define-variable notify-show-mail
"If true, the notifier displays your mail status."
true
--
2.25.1