From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 6 Jun 2009 23:25:56 +0000 (+0000)
Subject: * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
X-Git-Tag: emacs-pretest-23.0.95~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=661aaece107f6cafb56d865ee07092aeb49a663e;p=emacs.git

* tramp.el (tramp-open-connection-setup-interactive-shell): Apply
workaround for OpenSolaris bug.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e2dbe5e7bc..f505c6a09cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.el (tramp-open-connection-setup-interactive-shell): Apply
+	workaround for OpenSolaris bug.
+
 2009-06-05  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.el (epa-decrypt-region): Detect encoding if
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b2d5708d748..b6bfcf70901 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6090,6 +6090,13 @@ process to set up.  VEC specifies the connection."
 
   ;; Set the environment.
   (tramp-message vec 5 "Setting default environment")
+
+  ;; On OpenSolaris, there is a bug when HISTFILE is changed in place
+  ;; <http://bugs.opensolaris.org/view_bug.do?bug_id=6834184>.  We
+  ;; apply the workaround.
+  (if (string-equal (tramp-get-connection-property vec "uname" "") "SunOS 5.11")
+      (tramp-send-command vec "unset HISTFILE"))
+
   (let ((env (copy-sequence tramp-remote-process-environment))
 	unset item)
     (while env
@@ -7767,6 +7774,7 @@ Only works for Bourne-like shells."
 ;;   might be worthwhile to add some way to indicate that a particular
 ;;   use of process-file is (supposed to be) free of side-effects.
 ;;   (Stefan Monnier)
+;; * Use lsh instead of ssh (Alfred M. Szmidt)
 
 ;; Functions for file-name-handler-alist:
 ;; diff-latest-backup-file -- in diff.el