[Emacs-diffs] Changes to emacs/lisp/terminal.el

[Richard M. Stallman]

Index: emacs/lisp/terminal.el
diff -c emacs/lisp/terminal.el:1.46 emacs/lisp/terminal.el:1.47
*** emacs/lisp/terminal.el:1.46 Thu Dec 20 13:46:15 2001
--- emacs/lisp/terminal.el      Thu Feb  7 12:42:39 2002
***************
*** 100,105 ****
--- 100,108 ----
  (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,258 ****
                        (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))))))))
           (while l
             (let ((doc (or (documentation (cdr (car l)))
                            "Not documented")))
--- 250,258 ----
                        (where-is-internal 'te-escape-extended-command
                                           terminal-escape-map t)
                        'te-escape-extended-command))
!        (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")))