summaryrefslogtreecommitdiff
path: root/lisp/terminal.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2002-02-07 17:42:39 +0000
committerRichard M. Stallman <rms@gnu.org>2002-02-07 17:42:39 +0000
commitd05ea5b11fea165d1309e81fb5e446507adcee34 (patch)
tree474be4592eea7426e01f99e1a50f821d8d4f3359 /lisp/terminal.el
parent92840a31c80bc888c161f53524e79d567a29334d (diff)
downloademacs-d05ea5b11fea165d1309e81fb5e446507adcee34.tar.gz
(terminal-map): Define [menu-bar] so global def is seen.
Diffstat (limited to 'lisp/terminal.el')
-rw-r--r--lisp/terminal.el12
1 files changed, 6 insertions, 6 deletions
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")))