diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-10 11:28:40 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-10 11:28:40 -0700 |
| commit | caa4d9c4e7205cc62a9f414903e965494a703763 (patch) | |
| tree | e2c7d913de302f0c5c1c497fe1e76d9f133fe0cb /lib-src | |
| parent | 243b68f73ff7cbb4d89a3f4a15a1cd38cfc14fae (diff) | |
| parent | 5afbf62674e741b06c01216fe37a5439e9d42307 (diff) | |
| download | emacs-caa4d9c4e7205cc62a9f414903e965494a703763.tar.gz emacs-caa4d9c4e7205cc62a9f414903e965494a703763.tar.bz2 emacs-caa4d9c4e7205cc62a9f414903e965494a703763.zip | |
Merge from origin/emacs-26
5afbf62 Fix emacsclient check for term.el buffer (Bug#21041)
5132a58 Improve documentation of 'set-fontset-font'
cd90325 Improve documentation of M-?
155a885 Reinterpret Esperanto characters in iso-transl as iso-8859-3.
a0ef733 Fix Flyspell mode when several languages are mixed in a buffer
Diffstat (limited to 'lib-src')
| -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; |