Mercurial > emacs
comparison lisp/terminal.el @ 90650:02cf29720f31
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 07 Nov 2006 23:22:48 +0000 |
parents | c5406394f567 682027448d56 |
children | f1d13e615070 |
comparison
equal
deleted
inserted
replaced
90649:d53934e7ddef | 90650:02cf29720f31 |
---|---|
1160 (error (fundamental-mode) | 1160 (error (fundamental-mode) |
1161 (signal (car err) (cdr err)))) | 1161 (signal (car err) (cdr err)))) |
1162 (setq inhibit-quit t) ;sport death | 1162 (setq inhibit-quit t) ;sport death |
1163 (use-local-map terminal-map) | 1163 (use-local-map terminal-map) |
1164 (run-hooks 'terminal-mode-hook) | 1164 (run-hooks 'terminal-mode-hook) |
1165 (message "Entering emacs terminal-emulator... Type %s %s for help" | 1165 (message "Entering Emacs terminal-emulator... Type %s %s for help" |
1166 (single-key-description terminal-escape-char) | 1166 (single-key-description terminal-escape-char) |
1167 (mapconcat 'single-key-description | 1167 (mapconcat 'single-key-description |
1168 (where-is-internal 'te-escape-help terminal-escape-map t) | 1168 (where-is-internal 'te-escape-help terminal-escape-map t) |
1169 " "))) | 1169 " "))) |
1170 | 1170 |