Add option to DESCRIBE-BINDINGS to ignore "global" comtabs.

diff --git a/v7/src/edwin/hlpcom.scm b/v7/src/edwin/hlpcom.scm
index cdfdc37c86e7ab32068dc3c55c2f8046ee34148c..cddd26b41a0d7a209e626fabdbf16ec27c91ced5 100644 (file)
--- a/v7/src/edwin/hlpcom.scm
+++ b/v7/src/edwin/hlpcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: hlpcom.scm,v 1.113 2000/02/24 00:59:01 cph Exp $
+;;; $Id: hlpcom.scm,v 1.114 2000/02/24 01:30:24 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -394,6 +394,7 @@ If you want VALUE to be a string, you must surround it with doublequotes."
            (cons (let ((port (make-accumulator-output-port)))
                    (describe-bindings
                     (mode-comtabs (name->mode argument 'ERROR))
+                    #f
                     port)
                    (newline port)
                    (get-output-from-accumulator port))

diff --git a/v7/src/edwin/keymap.scm b/v7/src/edwin/keymap.scm
index 0a5be5e6a3e1aa401e80654df94ace2e2d726a18..826a7bcfc0121dcc95ac526515e9e3f0a3677b7e 100644 (file)
--- a/v7/src/edwin/keymap.scm
+++ b/v7/src/edwin/keymap.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;$Id: keymap.scm,v 1.15 2000/02/24 01:30:18 cph Exp $
+;;;$Id: keymap.scm,v 1.16 2000/02/24 01:31:11 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -134,10 +134,11 @@ Previous contents of that buffer are killed first."
   (let loop ((comtabs comtabs))
     (cons (sort-and-simplify (comtab->alist (car comtabs)))
          (if (and (pair? (cdr comtabs))
-                  (not (there-exists? global-modes
-                         (lambda (mode)
-                           (eq? (cdr comtabs) (mode-comtabs mode)))))
-                  (comtab? (cadr comtabs)))
+                  (comtab? (cadr comtabs))
+                  (or global?
+                      (not (there-exists? global-modes
+                             (lambda (mode)
+                               (eq? (cdr comtabs) (mode-comtabs mode)))))))
              (loop (cdr comtabs))
              '()))))