aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorNoam Postavsky2018-07-23 21:01:01 -0400
committerNoam Postavsky2018-08-08 19:29:59 -0400
commit5afbf62674e741b06c01216fe37a5439e9d42307 (patch)
tree5a971e3dab79743f3b591419fef9bffd232d377b /lib-src
parent5132a5856dcf0278811740551f435d8f301d2a72 (diff)
downloademacs-5afbf62674e741b06c01216fe37a5439e9d42307.tar.gz
emacs-5afbf62674e741b06c01216fe37a5439e9d42307.zip
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')
-rw-r--r--lib-src/emacsclient.c4
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)
1114 } 1114 }
1115 } 1115 }
1116 1116
1117 if (strcmp (type, "eterm") == 0) 1117 const char *inside_emacs = egetenv ("INSIDE_EMACS");
1118 if (inside_emacs && strstr (inside_emacs, ",term:")
1119 && strprefix ("eterm", type))
1118 { 1120 {
1119 if (noabort) 1121 if (noabort)
1120 return 0; 1122 return 0;