diff options
| author | Alan Third <alan@idiocy.org> | 2018-08-11 14:37:37 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2018-08-11 14:37:37 +0100 |
| commit | e39f975ee9e0b9f3682ee4b86800821d2e40aaa8 (patch) | |
| tree | 213a0f3172d10f941a03cbea578d6188c8dbd320 /lib-src/emacsclient.c | |
| parent | ef1abd99fafc9177058438cdf84776441ce62fc5 (diff) | |
| parent | 914b0300bcca8ac016b85df54ed36c98d07c74a7 (diff) | |
| download | emacs-scratch/ns-drawing.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into ns-drawingscratch/ns-drawing
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 739e6d5949e..4fe3a588b19 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1117,7 +1117,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; |