diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-07-23 21:01:01 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-08-08 19:29:59 -0400 |
| commit | 5afbf62674e741b06c01216fe37a5439e9d42307 (patch) | |
| tree | 5a971e3dab79743f3b591419fef9bffd232d377b /lib-src/emacsclient.c | |
| parent | 5132a5856dcf0278811740551f435d8f301d2a72 (diff) | |
| download | emacs-5afbf62674e741b06c01216fe37a5439e9d42307.tar.gz | |
Fix emacsclient check for term.el buffer (Bug#21041)
* lib-src/emacsclient.c (find_tty): Check for any TERM value with
prefix of "eterm", not just "eterm" itself. Also check for ",term:"
in INSIDE_EMACS value.
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index b139b2fe3f6..b0243f99c26 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1114,7 +1114,9 @@ find_tty (const char **tty_type, const char **tty_name, int noabort) } } - if (strcmp (type, "eterm") == 0) + const char *inside_emacs = egetenv ("INSIDE_EMACS"); + if (inside_emacs && strstr (inside_emacs, ",term:") + && strprefix ("eterm", type)) { if (noabort) return 0; |