diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /lisp/term.el | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/term.el b/lisp/term.el index e6466b8fa95..d6acaef1ae9 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -4178,11 +4178,16 @@ the process. Any more args are arguments to PROGRAM." | |||
| 4178 | (term-mode) | 4178 | (term-mode) |
| 4179 | (term-char-mode) | 4179 | (term-char-mode) |
| 4180 | 4180 | ||
| 4181 | ;; I wanna have find-file on C-x C-f -mm | 4181 | ;; Historical baggage. A call to term-set-escape-char used to not |
| 4182 | ;; your mileage may definitely vary, maybe it's better to put this in your | 4182 | ;; undo any previous call to t-s-e-c. Because of this, ansi-term |
| 4183 | ;; .emacs ... | 4183 | ;; ended up with both C-x and C-c as escape chars. Who knows what |
| 4184 | 4184 | ;; the original intention was, but people could have become used to | |
| 4185 | (term-set-escape-char ?\C-x) | 4185 | ;; either. (Bug#12842) |
| 4186 | (let (term-escape-char) | ||
| 4187 | ;; I wanna have find-file on C-x C-f -mm | ||
| 4188 | ;; your mileage may definitely vary, maybe it's better to put this in your | ||
| 4189 | ;; .emacs ... | ||
| 4190 | (term-set-escape-char ?\C-x)) | ||
| 4186 | 4191 | ||
| 4187 | (switch-to-buffer term-ansi-buffer-name)) | 4192 | (switch-to-buffer term-ansi-buffer-name)) |
| 4188 | 4193 | ||