aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2009-06-06 23:25:56 +0000
committerMichael Albinus2009-06-06 23:25:56 +0000
commit661aaece107f6cafb56d865ee07092aeb49a663e (patch)
treea2ba6f20f20323ed79a464a316912f20b4410464
parent8c9bb6f5d854daf9efeb6460aacc4de6e3e2945c (diff)
downloademacs-661aaece107f6cafb56d865ee07092aeb49a663e.tar.gz
emacs-661aaece107f6cafb56d865ee07092aeb49a663e.zip
* tramp.el (tramp-open-connection-setup-interactive-shell): Apply
workaround for OpenSolaris bug.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el8
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e2dbe5e7bc..f505c6a09cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-06-06 Michael Albinus <michael.albinus@gmx.de>
2
3 * tramp.el (tramp-open-connection-setup-interactive-shell): Apply
4 workaround for OpenSolaris bug.
5
12009-06-05 Daiki Ueno <ueno@unixuser.org> 62009-06-05 Daiki Ueno <ueno@unixuser.org>
2 7
3 * epa.el (epa-decrypt-region): Detect encoding if 8 * 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."
6090 6090
6091 ;; Set the environment. 6091 ;; Set the environment.
6092 (tramp-message vec 5 "Setting default environment") 6092 (tramp-message vec 5 "Setting default environment")
6093
6094 ;; On OpenSolaris, there is a bug when HISTFILE is changed in place
6095 ;; <http://bugs.opensolaris.org/view_bug.do?bug_id=6834184>. We
6096 ;; apply the workaround.
6097 (if (string-equal (tramp-get-connection-property vec "uname" "") "SunOS 5.11")
6098 (tramp-send-command vec "unset HISTFILE"))
6099
6093 (let ((env (copy-sequence tramp-remote-process-environment)) 6100 (let ((env (copy-sequence tramp-remote-process-environment))
6094 unset item) 6101 unset item)
6095 (while env 6102 (while env
@@ -7767,6 +7774,7 @@ Only works for Bourne-like shells."
7767;; might be worthwhile to add some way to indicate that a particular 7774;; might be worthwhile to add some way to indicate that a particular
7768;; use of process-file is (supposed to be) free of side-effects. 7775;; use of process-file is (supposed to be) free of side-effects.
7769;; (Stefan Monnier) 7776;; (Stefan Monnier)
7777;; * Use lsh instead of ssh (Alfred M. Szmidt)
7770 7778
7771;; Functions for file-name-handler-alist: 7779;; Functions for file-name-handler-alist:
7772;; diff-latest-backup-file -- in diff.el 7780;; diff-latest-backup-file -- in diff.el