From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 24 Feb 2000 01:31:11 +0000 (+0000)
Subject: Add option to DESCRIBE-BINDINGS to ignore "global" comtabs.
X-Git-Tag: 20090517-FFI~4239
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0b3f9678e15855c5d1e6b4f001e15d4512ec5728;p=mit-scheme.git

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

diff --git a/v7/src/edwin/hlpcom.scm b/v7/src/edwin/hlpcom.scm
index cdfdc37c8..cddd26b41 100644
--- 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 0a5be5e6a..826a7bcfc 100644
--- 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))
 	      '()))))