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

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;