Change DEFINE-KEY to automatically define prefix keys as needed.

diff --git a/v7/src/edwin/comint.scm b/v7/src/edwin/comint.scm
index c4c6aa10109a8529dc89b382d95de71d42eb2bf3..ba5b455b8eb2735b7b22184dccc58342e0d39b0b 100644 (file)
--- a/v7/src/edwin/comint.scm
+++ b/v7/src/edwin/comint.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/comint.scm,v 1.3 1991/04/21 00:49:16 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/comint.scm,v 1.4 1991/05/06 01:03:32 cph Exp $
 
 Copyright (c) 1991 Massachusetts Institute of Technology
 
@@ -142,8 +142,6 @@ Entry to this mode runs the hooks on comint-mode-hook."
 (define-key 'comint #\M-n 'comint-next-input)
 (define-key 'comint #\M-s 'comint-previous-similar-input)
 
-(define-prefix-key 'comint #\C-c 'prefix-char)
-
 (define-key 'comint '(#\C-c #\C-c) 'comint-interrupt-subjob)
 (define-key 'comint '(#\C-c #\C-f) 'comint-continue-subjob)
 (define-key 'comint '(#\C-c #\C-l) 'comint-show-output)

diff --git a/v7/src/edwin/comtab.scm b/v7/src/edwin/comtab.scm
index f58a6ded8d2f49dce15f24499e50d6c880ad5eea..726cb9f71302a51ac4806456e478f5e132d5f92e 100644 (file)
--- a/v7/src/edwin/comtab.scm
+++ b/v7/src/edwin/comtab.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/comtab.scm,v 1.58 1991/05/06 01:00:24 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/comtab.scm,v 1.59 1991/05/06 01:02:48 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -77,6 +77,8 @@
                        (if-defined alists char))
                       ((assq char (car alists))
                        => (lambda (entry) (loop (cdr entry) chars)))
+                      ((assq char (cdr alists))
+                       (error "Illegal prefix key:" key))
                       ((not if-undefined)
                        (set-comtab-entry! alists
                                           char

diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm
index f11d613e0c914b67331097fc8762f108edf8fb18..348cd6097097013083731c003373f576c6d676f8 100644 (file)
--- a/v7/src/edwin/info.scm
+++ b/v7/src/edwin/info.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.102 1991/05/06 00:55:53 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.103 1991/05/06 01:04:08 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -297,7 +297,6 @@ except for \\[info-cease-edit] to return to Info."
                       (string-append "^\1f\f\\|"
                                      (ref-variable page-delimiter))))
 
-(define-prefix-key 'info-edit #\c-c 'prefix-char)
 (define-key 'info-edit '(#\c-c #\c-c) 'info-cease-edit)
 
 (define-command info-cease-edit

diff --git a/v7/src/edwin/intmod.scm b/v7/src/edwin/intmod.scm
index 6dc1fbfffbd4df45c992bfd2844e5c42b3443096..95e2e89b612dbbd41f13804f103a163d88499c79 100644 (file)
--- a/v7/src/edwin/intmod.scm
+++ b/v7/src/edwin/intmod.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/intmod.scm,v 1.37 1991/03/16 00:02:24 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/intmod.scm,v 1.38 1991/05/06 01:04:35 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -90,6 +90,5 @@ The history may be accessed with the following commands:
 (define-key 'scheme-interaction #\M-p 'comint-previous-input)
 (define-key 'scheme-interaction #\M-n 'comint-next-input)
 
-(define-prefix-key 'scheme-interaction #\C-c 'prefix-char)
 (define-key 'scheme-interaction '(#\C-c #\C-r) 'comint-history-search-backward)
 (define-key 'scheme-interaction '(#\C-c #\C-s) 'comint-history-search-forward)
\ No newline at end of file

diff --git a/v7/src/edwin/sendmail.scm b/v7/src/edwin/sendmail.scm
index d91c5312835881dc458f216f72b24b36b18bf824..f76be24cc53c1b86f7ae5a3ee9c56ee4a25c2c14 100644 (file)
--- a/v7/src/edwin/sendmail.scm
+++ b/v7/src/edwin/sendmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/sendmail.scm,v 1.6 1991/05/02 01:14:23 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/sendmail.scm,v 1.7 1991/05/06 01:05:36 cph Exp $
 ;;;
 ;;;    Copyright (c) 1991 Massachusetts Institute of Technology
 ;;;
@@ -228,9 +228,6 @@ C-c C-q  mail-fill-yanked-message (fill what was yanked)."
   "An event distributor that is invoked when entering Mail mode."
   (make-event-distributor))
 
-(define-prefix-key 'mail #\C-c 'prefix-char)
-(define-prefix-key 'mail '(#\C-c #\C-f) 'prefix-char)
-
 (define-key 'mail '(#\C-c #\?) 'describe-mode)
 (define-key 'mail '(#\C-c #\C-f #\C-t) 'mail-to)
 (define-key 'mail '(#\C-c #\C-f #\C-b) 'mail-bcc)