From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 17 Nov 1992 05:48:07 +0000 (+0000)
Subject: Fixes to last set of changes.
X-Git-Tag: 20090517-FFI~8765
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=536250c391f46438a21aad8d0cd1da4c1a093b91;p=mit-scheme.git

Fixes to last set of changes.
---

diff --git a/v7/src/edwin/buffer.scm b/v7/src/edwin/buffer.scm
index c7b75b51e..45ec378e2 100644
--- a/v7/src/edwin/buffer.scm
+++ b/v7/src/edwin/buffer.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: buffer.scm,v 1.158 1992/11/16 22:40:50 cph Exp $
+;;;	$Id: buffer.scm,v 1.159 1992/11/17 05:48:02 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -386,19 +386,19 @@ The buffer is guaranteed to be deselected at that time."
 	     (car bindings)
 	     (loop (cdr bindings))))))
 
-(define (undo-local-bindings!)
+(define (undo-local-bindings! buffer)
   ;; Caller guarantees that interrupts are disabled.
-  (let ((buffer (current-buffer)))
-    (let ((bindings (buffer-local-bindings buffer)))
-      (do ((bindings bindings (cdr bindings)))
-	  ((null? bindings))
-	(vector-set! (caar bindings)
-		     variable-index:value
-		     (variable-default-value (caar bindings))))
-      (vector-set! buffer buffer-index:local-bindings '())
-      (do ((bindings bindings (cdr bindings)))
-	  ((null? bindings))
-	(invoke-variable-assignment-daemons! buffer (caar bindings))))))
+  (let ((bindings (buffer-local-bindings buffer)))
+    (if (buffer-local-bindings-installed? buffer)
+	(do ((bindings bindings (cdr bindings)))
+	    ((null? bindings))
+	  (vector-set! (caar bindings)
+		       variable-index:value
+		       (variable-default-value (caar bindings)))))
+    (vector-set! buffer buffer-index:local-bindings '())
+    (do ((bindings bindings (cdr bindings)))
+	((null? bindings))
+      (invoke-variable-assignment-daemons! buffer (caar bindings)))))
 
 (define (with-current-local-bindings! thunk)
   (dynamic-wind (lambda ()
@@ -469,7 +469,7 @@ The buffer is guaranteed to be deselected at that time."
        (set-cdr! modes '()))
      (set-buffer-comtabs! buffer (mode-comtabs mode))
      (vector-set! buffer buffer-index:alist '())
-     (undo-local-bindings!)
+     (undo-local-bindings! buffer)
      ((mode-initialization mode) buffer)
      (buffer-modeline-event! buffer 'BUFFER-MODES))))
 
diff --git a/v7/src/edwin/filcom.scm b/v7/src/edwin/filcom.scm
index 9b1d93512..a5ba26c6e 100644
--- a/v7/src/edwin/filcom.scm
+++ b/v7/src/edwin/filcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: filcom.scm,v 1.172 1992/11/16 22:41:00 cph Exp $
+;;;	$Id: filcom.scm,v 1.173 1992/11/17 05:48:05 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -205,7 +205,7 @@ invocation."
 				  '(EDWIN)
 				  edwin-syntax-table))))))))))
 	  (if (and (procedure? database)
-		   (procedure-arity-valid? database 0))
+		   (procedure-arity-valid? database 1))
 	      (database buffer)
 	      (message
 	       "Ill-formed find-file initialization file: "
diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm
index a759eac3b..05e8b1d9e 100644
--- a/v7/src/edwin/schmod.scm
+++ b/v7/src/edwin/schmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: schmod.scm,v 1.27 1992/11/16 22:41:15 cph Exp $
+;;;	$Id: schmod.scm,v 1.28 1992/11/17 05:48:06 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -92,8 +92,8 @@ The following commands evaluate Scheme expressions:
 	  (ref-variable-object paragraph-start)
 	separate)
       (define-variable-local-value! buffer
-	  (ref-variable-object paragraph-separate))
-      separate)
+	  (ref-variable-object paragraph-separate)
+	separate))
     (define-variable-local-value! buffer
 	(ref-variable-object paragraph-ignore-fill-prefix)
       true)
diff --git a/v7/src/edwin/texcom.scm b/v7/src/edwin/texcom.scm
index d60a9d2d4..570e7b7c8 100644
--- a/v7/src/edwin/texcom.scm
+++ b/v7/src/edwin/texcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: texcom.scm,v 1.36 1992/11/16 22:41:19 cph Exp $
+;;;	$Id: texcom.scm,v 1.37 1992/11/17 05:48:07 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -68,8 +68,8 @@
   "An event distributor that is invoked when entering Text mode."
   (make-event-distributor))
 
-(define (turn-on-auto-fill)
-  (enable-current-minor-mode! (ref-mode-object auto-fill)))
+(define (turn-on-auto-fill buffer)
+  (enable-buffer-minor-mode! buffer (ref-mode-object auto-fill)))
 
 (define-command text-mode
   "Make the current mode be Text mode."