Fixes to last set of changes.

diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm
index baf2ccdaf46e651802af2c1f20e633565f52e0eb..68ef077fc127628cbc3d75e4ed3ade80ed0d8d70 100644 (file)
--- a/v7/src/edwin/info.scm
+++ b/v7/src/edwin/info.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: info.scm,v 1.114 1992/11/17 17:38:12 cph Exp $
+;;;    $Id: info.scm,v 1.115 1992/11/17 17:38:34 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -301,7 +301,7 @@ The editing commands are the same as in Text mode,
 except for \\[info-cease-edit] to return to Info."
   (lambda (buffer)
     (define-variable-local-value! buffer (ref-variable-object page-delimiter)
-      (string-append "^\1f\f\\|" (ref-variable page-delimiter)))))
+      (string-append "^\1f\f\\|" (ref-variable page-delimiter buffer)))))
 
 (define-key 'info-edit '(#\c-c #\c-c) 'info-cease-edit)
 

diff --git a/v7/src/edwin/intmod.scm b/v7/src/edwin/intmod.scm
index 25d301fd0583b569b886d839e126b9465988477a..c170e7da8ed73e32327738f93085d6ce787dda8d 100644 (file)
--- a/v7/src/edwin/intmod.scm
+++ b/v7/src/edwin/intmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: intmod.scm,v 1.52 1992/11/16 22:41:05 cph Exp $
+;;;    $Id: intmod.scm,v 1.53 1992/11/17 17:39:01 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -288,7 +288,8 @@ The REPL may be controlled by the following commands:
 \\[inferior-cmdl-abort-top-level] returns to top level.
 \\[inferior-cmdl-abort-previous] goes up one level."
   (lambda (buffer)
-    (event-distributor/invoke! (ref-variable inferior-repl-mode-hook) buffer)))
+    (event-distributor/invoke! (ref-variable inferior-repl-mode-hook buffer)
+                              buffer)))
 
 (define-variable inferior-repl-mode-hook
   "An event distributor that is invoked when entering Inferior REPL mode."
@@ -322,7 +323,8 @@ Additionally, these commands abort the command loop:
 \\[inferior-cmdl-abort-top-level] returns to the top-level REPL.
 \\[inferior-cmdl-abort-previous] returns to the previous level REPL."
   (lambda (buffer)
-    (event-distributor/invoke! (ref-variable inferior-cmdl-mode-hook) buffer)))
+    (event-distributor/invoke! (ref-variable inferior-cmdl-mode-hook buffer)
+                              buffer)))
 
 (define-variable inferior-cmdl-mode-hook
   "An event distributor that is invoked when entering Inferior CMDL mode."

diff --git a/v7/src/edwin/midas.scm b/v7/src/edwin/midas.scm
index aef6dafa14517106763a3f26dbbf62c29fc5ec7e..5bbdf7112a5d666a75b39b93b35d92e1718dc10f 100644 (file)
--- a/v7/src/edwin/midas.scm
+++ b/v7/src/edwin/midas.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: midas.scm,v 1.16 1992/11/16 22:41:08 cph Exp $
+;;;    $Id: midas.scm,v 1.17 1992/11/17 17:40:02 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -69,15 +69,17 @@
       ";")
     (define-variable-local-value! buffer (ref-variable-object comment-end)
       "")
-    (define-variable-local-value! buffer (ref-variable-object paragraph-start)
-      "^$")
-    (define-variable-local-value! buffer
-       (ref-variable-object paragraph-separate)
-      (ref-variable paragraph-start))
+    (let ((paragraph-start "^$"))
+      (define-variable-local-value! buffer
+         (ref-variable-object paragraph-start)
+       paragraph-start)
+      (define-variable-local-value! buffer
+         (ref-variable-object paragraph-separate)
+       paragraph-start))
     (define-variable-local-value! buffer
        (ref-variable-object indent-line-procedure)
       (ref-command insert-tab))
-    (event-distributor/invoke! (ref-variable midas-mode-hook))))
+    (event-distributor/invoke! (ref-variable midas-mode-hook buffer) buffer)))
 
 (define midas-mode:syntax-table (make-syntax-table))
 (modify-syntax-entry! midas-mode:syntax-table #\; "<   ")

diff --git a/v7/src/edwin/pasmod.scm b/v7/src/edwin/pasmod.scm
index 31d4f13d0da5cd93f4b90c140640d10c5cb98234..803cec19f88e51a89d15a93faf80ffa217967530 100644 (file)
--- a/v7/src/edwin/pasmod.scm
+++ b/v7/src/edwin/pasmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: pasmod.scm,v 1.45 1992/11/16 22:41:09 cph Exp $
+;;;    $Id: pasmod.scm,v 1.46 1992/11/17 17:40:51 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-92 Massachusetts Institute of Technology
 ;;;
@@ -75,12 +75,14 @@
       "(* ")
     (define-variable-local-value! buffer (ref-variable-object comment-end)
       " *)")
-    (define-variable-local-value! buffer (ref-variable-object paragraph-start)
-      "^$")
-    (define-variable-local-value! buffer
-       (ref-variable-object paragraph-separate)
-      (ref-variable paragraph-start))
-    (event-distributor/invoke! (ref-variable pascal-mode-hook) buffer)))
+    (let ((paragraph-start "^$"))
+      (define-variable-local-value! buffer
+         (ref-variable-object paragraph-start)
+       paragraph-start)
+      (define-variable-local-value! buffer
+         (ref-variable-object paragraph-separate)
+       paragraph-start))
+    (event-distributor/invoke! (ref-variable pascal-mode-hook buffer) buffer)))
 
 (define pascal-mode:syntax-table (make-syntax-table))
 (modify-syntax-entry! pascal-mode:syntax-table #\( "()1 ")

diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index b5b2d15bf67a2965e5141a7305174d6efb7fec71..003ba7a9a71e611c099124d50bfee3492c9021db 100644 (file)
--- a/v7/src/edwin/rmail.scm
+++ b/v7/src/edwin/rmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: rmail.scm,v 1.23 1992/11/16 22:41:10 cph Exp $
+;;;    $Id: rmail.scm,v 1.24 1992/11/17 17:42:13 cph Exp $
 ;;;
 ;;;    Copyright (c) 1991-92 Massachusetts Institute of Technology
 ;;;
@@ -177,18 +177,18 @@ w Edit the current message.  C-c C-c to return to Rmail."
        (ref-variable-object require-final-newline)
       false)
     (define-variable-local-value! buffer (ref-variable-object rmail-last-file)
-      (ref-variable rmail-last-file))
+      (ref-variable rmail-last-file buffer))
     (define-variable-local-value! buffer (ref-variable-object rmail-inbox-list)
       (let ((inboxes (parse-file-inboxes buffer)))
        (if (and (null? inboxes)
                 (pathname=? (buffer-pathname buffer)
-                            (ref-variable rmail-file-name)))
-           (ref-variable rmail-primary-inbox-list)
+                            (ref-variable rmail-file-name buffer)))
+           (ref-variable rmail-primary-inbox-list buffer)
            inboxes)))
     (buffer-put! buffer 'REVERT-BUFFER-METHOD rmail-revert-buffer)
     (memoize-buffer buffer)
     (set-buffer-read-only! buffer)
-    (event-distributor/invoke! (ref-variable rmail-mode-hook) buffer)))
+    (event-distributor/invoke! (ref-variable rmail-mode-hook buffer) buffer)))
 
 (define-major-mode rmail-edit text "RMAIL Edit"
   "Major mode for editing the contents of an RMAIL message.
@@ -2033,4 +2033,4 @@ Note:    it means the file has no messages in it.\n\037")
   "\n*\n\n----------------------------*\n*")
 
 (define digest-separator-replacement
-  (string-append "\n\037" babyl-initial-message-start))
+  (string-append "\n\037" babyl-initial-message-start))
\ No newline at end of file