From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 20 Oct 2016 12:57:17 +0000 (+0200)
Subject: Document, how to suppress iTerm2 shell integration in Tramp
X-Git-Tag: emacs-26.0.90~1463
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38091c90005932017cbac54f2f5b82b3a003b9fa;p=emacs.git

Document, how to suppress iTerm2 shell integration in Tramp

* doc/misc/tramp.texi (Frequently Asked Questions):
Suppress iTerm2 shell integration.
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index c3b54c612f0..d8a2beac405 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2886,8 +2886,21 @@ end
 @end group
 @end example
 
-When using WinSSHD on remote hosts, @value{tramp} do not recognize the
-strange prompt settings.
+When using WinSSHD on remote hosts, @value{tramp} does not recognize
+the strange prompt settings.
+
+A similar problem exist with the iTerm2 shell integration, which sends
+proprietary escape codes when starting a shell.  This can be
+suppressed by changing the respective integration snippet in your
+@file{~/.profile} like this:
+
+@example
+@group
+[ $TERM = "dumb" ] || \
+test -e "$@{HOME@}/.iterm2_shell_integration.bash" && \
+source "$@{HOME@}/.iterm2_shell_integration.bash"
+@end group
+@end example
 
 @item
 Echoed characters after login