From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 7 Feb 2002 17:42:39 +0000 (+0000)
Subject: (terminal-map): Define [menu-bar] so global def is seen.
X-Git-Tag: ttn-vms-21-2-B4~16787
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d05ea5b11fea165d1309e81fb5e446507adcee34;p=emacs.git

(terminal-map): Define [menu-bar] so global def is seen.
---

diff --git a/lisp/terminal.el b/lisp/terminal.el
index 303bb695f42..438f1690673 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -100,6 +100,9 @@ performance."
 (if terminal-map
     nil
   (let ((map (make-sparse-keymap)))
+    ;; Prevent defining [menu-bar] as te-pass-through
+    ;; so we allow the global menu bar to be visible.
+    (define-key map [menu-bar] (make-sparse-keymap))
     (define-key map [t] 'te-pass-through)
     (define-key map [switch-frame] 'handle-switch-frame)
     (define-key map "\e" terminal-meta-map)
@@ -247,12 +250,9 @@ Other chars following \"%s\" are interpreted as follows:\n"
 			(where-is-internal 'te-escape-extended-command
 					   terminal-escape-map t)
 			'te-escape-extended-command))
-	 (let ((l (if (fboundp 'sortcar)
-		      (sortcar (copy-sequence te-escape-command-alist)
-			       'string<)
-		      (sort (copy-sequence te-escape-command-alist)
-			    (function (lambda (a b)
-                              (string< (car a) (car b))))))))
+	 (let ((l (sort (copy-sequence te-escape-command-alist)
+			(function (lambda (a b)
+				    (string< (car a) (car b)))))))
 	   (while l
 	     (let ((doc (or (documentation (cdr (car l)))
 			    "Not documented")))