diff options
| author | Stefan Monnier | 2014-06-13 11:06:29 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-06-13 11:06:29 -0400 |
| commit | 40be983bc68c95ad63f1135da3a82aec1aa32e2a (patch) | |
| tree | d3750db7120cd4f809f4bc8914beb4832988887d | |
| parent | 4346235f61172f2c55dfbbd2b830233e005987e7 (diff) | |
| download | emacs-40be983bc68c95ad63f1135da3a82aec1aa32e2a.tar.gz emacs-40be983bc68c95ad63f1135da3a82aec1aa32e2a.zip | |
* lisp/term/xterm.el (xterm--version-handler): Work around for OSX
Terminal.app.
Fixes: debbugs:17607
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca2781b40f2..1ecc6a140ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * term/xterm.el (xterm--version-handler): Work around for OSX | ||
| 4 | Terminal.app (bug#17607). | ||
| 5 | |||
| 1 | 2014-06-08 Glenn Morris <rgm@gnu.org> | 6 | 2014-06-08 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * startup.el (initial-buffer-choice): Doc fix. | 8 | * startup.el (initial-buffer-choice): Doc fix. |
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 52487f3bded..5d4112b24fd 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -509,6 +509,10 @@ The relevant features are: | |||
| 509 | ;; Gnome terminal 3.6.1 reports 1;3406;0 | 509 | ;; Gnome terminal 3.6.1 reports 1;3406;0 |
| 510 | ;; Gnome terminal 2.32.1 reports 1;2802;0 | 510 | ;; Gnome terminal 2.32.1 reports 1;2802;0 |
| 511 | (setq version 200)) | 511 | (setq version 200)) |
| 512 | (when (equal (match-string 1 str) "83") | ||
| 513 | ;; OSX's Terminal.app (version 2.3 (309), which returns 83;40003;0) | ||
| 514 | ;; seems to also lack support for some of these (bug#17607). | ||
| 515 | (setq version 240)) | ||
| 512 | ;; If version is 242 or higher, assume the xterm supports | 516 | ;; If version is 242 or higher, assume the xterm supports |
| 513 | ;; reporting the background color (TODO: maybe earlier | 517 | ;; reporting the background color (TODO: maybe earlier |
| 514 | ;; versions do too...) | 518 | ;; versions do too...) |