[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 5afbf62 1/2: Fix emacsclient check for term.el bu
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 5afbf62 1/2: Fix emacsclient check for term.el buffer (Bug#21041) |
Date: |
Wed, 8 Aug 2018 19:50:17 -0400 (EDT) |
branch: emacs-26
commit 5afbf62674e741b06c01216fe37a5439e9d42307
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
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.
---
lib-src/emacsclient.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b139b2f..b0243f9 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;