[Emacs-diffs] /srv/bzr/emacs/trunk r111836: * tramp.texi (Android shell setup): Improve. Reported by Thierry

[Michael Albinus]

------------------------------------------------------------
revno: 111836
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Wed 2013-02-20 15:49:52 +0100
message:
  * tramp.texi (Android shell setup): Improve.  Reported by Thierry
  Volpiatto <address@hidden>.
modified:
  doc/misc/ChangeLog
  doc/misc/tramp.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-02-16 17:38:37 +0000
+++ b/doc/misc/ChangeLog        2013-02-20 14:49:52 +0000
@@ -1,3 +1,8 @@
+2013-02-20  Michael Albinus  <address@hidden>
+
+       * tramp.texi (Android shell setup): Improve.  Reported by Thierry
+       Volpiatto <address@hidden>.
+
 2013-02-16  Michael Albinus  <address@hidden>
 
        * tramp.texi (Top, Configuration): Insert section `Android shell

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2013-02-19 14:44:03 +0000
+++ b/doc/misc/tramp.texi       2013-02-20 14:49:52 +0000
@@ -2016,7 +2016,7 @@
 
 When an @command{sshd} process runs on the Android device, like
 provided by the @code{SSHDroid} app, any @option{ssh}-based method can
-be used.  However, this requires some special settings.
+be used.  This requires some special settings.
 
 The default shell @code{/bin/sh} does not exist.  Instead, you shall
 use just @code{sh}, which invokes the shell installed on the device.
@@ -2031,23 +2031,50 @@
 with @samp{192.168.0.26} being the IP address of your Android device.
 
 The user settings for the @code{$PATH} environment variable must be
-preserved.  Add this setting:
+preserved.  It has also been reported, that the commands in
address@hidden/system/xbin} are better suited than the ones in
address@hidden/system/bin}.  Add these setting:
 
 @lisp
 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+(add-to-list 'tramp-remote-path "/system/xbin")
 @end lisp
 
address@hidden
 If the Android device is not @samp{rooted}, you must give the shell a
-writable directory for temporary files.  You could use this setting:
+writable directory for temporary files:
 
 @lisp
 (add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
 @end lisp
 
address@hidden
 Now you shall be able to open a remote connection with @kbd{C-x C-f
 @trampfn{ssh, , 192.168.0.26#2222, }}, given that @command{sshd}
 listens on port @samp{2222}.
 
+It is also recommended to add a corresponding entry to your
address@hidden/.ssh/config} for that connection, like
+
address@hidden
+Host android
+     HostName 192.168.0.26
+     User root
+     Port 2222
address@hidden example
+
address@hidden
+In this case, you must change the setting for the remote shell to
+
address@hidden
+(add-to-list 'tramp-connection-properties
+            (list (regexp-quote "android") "remote-shell" "sh"))
address@hidden lisp
+
address@hidden
+You would open the connection with @kbd{C-x C-f @trampfn{ssh, ,
+android, }} then.
+
 
 @node Auto-save and Backup
 @section Auto-save and Backup configuration