From ceedd86ed448b2cd27a5f96297ce7011eb1e0b97 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 30 Jun 2017 18:38:32 +0200
Subject: [PATCH] Release Tramp 2.3.2

* doc/misc/tramp.texi (Android shell setup): Show default file name.
Structure section.

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.3.2".

* test/lisp/net/tramp-tests.el (tramp-test-temporary-file-directory):
Offer home directory for mock method if it doesn't exist.
---
 doc/misc/tramp.texi          | 18 ++++++++++++------
 doc/misc/trampver.texi       |  2 +-
 lisp/net/trampver.el         |  6 +++---
 test/lisp/net/tramp-tests.el |  4 ++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a42dc6ed3c0..ce503aeb197 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1896,12 +1896,16 @@ where @samp{192.168.0.1} is the remote host IP address
 @value{tramp} uses the @option{adb} method to access Android devices.
 Android devices provide a restricted shell access through an USB
 connection.  The local host must have the @command{adb} program
-installed.
+installed.  Usually, it is sufficient to open the file
+@file{@trampfn{adb,,/}}.  Then you can navigate in the filesystem via
+@code{dired}.
 
-Applications such as @code{SSHDroid} that run @command{sshd} process
-on the Android device can accept any @option{ssh}-based methods
-provided these settings are adjusted:
+Alternatively, applications such as @code{SSHDroid} that run
+@command{sshd} process on the Android device can accept any
+@option{ssh}-based methods provided these settings are adjusted:
 
+@itemize
+@item
 @command{sh} must be specified for remote shell since Android devices
 do not provide @command{/bin/sh}.  @command{sh} will then invoke
 whatever shell is installed on the device with this setting:
@@ -1917,6 +1921,7 @@ whatever shell is installed on the device with this setting:
 where @samp{192.168.0.26} is the Android device's IP address.
 (@pxref{Predefined connection information}).
 
+@item
 @value{tramp} requires preserving @env{PATH} environment variable from
 user settings.  Android devices prefer @file{/system/xbin} path over
 @file{/system/bin}.  Both of these are set as follows:
@@ -1928,7 +1933,7 @@ user settings.  Android devices prefer @file{/system/xbin} path over
 @end group
 @end lisp
 
-@noindent
+@item
 When the Android device is not @samp{rooted}, specify a writable
 directory for temporary files:
 
@@ -1936,7 +1941,7 @@ directory for temporary files:
 (add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
 @end lisp
 
-@noindent
+@item
 Open a remote connection with the command @kbd{C-x C-f
 @trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening
 on port @samp{2222}.
@@ -1967,6 +1972,7 @@ the previous example, fix the connection properties as follows:
 @noindent
 Open a remote connection with a more concise command @kbd{C-x C-f
 @trampfn{ssh,android,}}.
+@end itemize
 
 
 @node Auto-save and Backup
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index f1cb60b9d25..05b577da005 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.3.2-pre
+@set trampver 2.3.2
 
 @c Other flags from configuration
 @set instprefix /usr/local
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 387a3c8bb36..4be487e1f4f 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.3.2-pre
+;; Version: 2.3.2
 
 ;; This file is part of GNU Emacs.
 
@@ -33,7 +33,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.3.2-pre"
+(defconst tramp-version "2.3.2"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -55,7 +55,7 @@
 ;; Check for Emacs version.
 (let ((x (if (>= emacs-major-version 24)
     "ok"
-  (format "Tramp 2.3.2-pre is not fit for %s"
+  (format "Tramp 2.3.2 is not fit for %s"
 	  (when (string-match "^.*$" (emacs-version))
 	    (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a10b8579032..a706ed5fb90 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -72,6 +72,10 @@
       (add-to-list
        'tramp-default-host-alist
        `("\\`mock\\'" nil ,(system-name)))
+      ;; Emacs' Makefile sets $HOME to a nonexistent value.  Needed in
+      ;; batch mode only, therefore.
+      (unless (and (null noninteractive) (file-directory-p "~/"))
+        (setenv "HOME" temporary-file-directory))
       (format "/mock::%s" temporary-file-directory)))
   "Temporary directory for Tramp tests.")
 
-- 
2.39.2