diff options
| author | Dan Nicolaescu | 2007-06-23 17:53:27 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-06-23 17:53:27 +0000 |
| commit | 0a8fc05dd5f7d49832cfb28d1c569e89b6ec9859 (patch) | |
| tree | 56a45903bf36b1bfd2f7fc672199f1f906ca0ef3 | |
| parent | b647cd3fd066110b9efb77c66b0dd304eb7ca504 (diff) | |
| download | emacs-0a8fc05dd5f7d49832cfb28d1c569e89b6ec9859.tar.gz emacs-0a8fc05dd5f7d49832cfb28d1c569e89b6ec9859.zip | |
(terminal-init-xterm): Fix previous change.
| -rw-r--r-- | lisp/ChangeLog.multi-tty | 4 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty index 0d89f9d15ca..80fc5f4d586 100644 --- a/lisp/ChangeLog.multi-tty +++ b/lisp/ChangeLog.multi-tty | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-06-23 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * term/xterm.el (terminal-init-xterm): Fix previous change. | ||
| 4 | |||
| 1 | 2007-06-18 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2007-06-18 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk. | 7 | * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk. |
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 1761ab35d3f..9cc4c6b45d6 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -391,7 +391,7 @@ | |||
| 391 | (substitute-key-definition [f59] [A-f11] local-function-key-map) | 391 | (substitute-key-definition [f59] [A-f11] local-function-key-map) |
| 392 | (substitute-key-definition [f60] [A-f12] local-function-key-map) | 392 | (substitute-key-definition [f60] [A-f12] local-function-key-map) |
| 393 | 393 | ||
| 394 | (let ((map (make-sparse-keymap))) | 394 | (let ((map (copy-keymap xterm-function-map))) |
| 395 | 395 | ||
| 396 | ;; Use inheritance to let the main keymap override those defaults. | 396 | ;; Use inheritance to let the main keymap override those defaults. |
| 397 | ;; This way we don't override terminfo-derived settings or settings | 397 | ;; This way we don't override terminfo-derived settings or settings |