feature/android updated (4ab9fa7507a -> c6809eb9278)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  4ab9fa7507a ; * lisp/loadup.el: Fix merge typos.
      adds  b3502b92282 Allow disabling viper faces in the minibuffer
      adds  2ac8d7e64a0 Improve Tramp's user and host name completion
      adds  750bc57cbb8 Don't rely on dynamic scoping to fix bug#59213
       new  2bcfa0e68e4 Merge remote-tracking branch 'origin/master' into 
feature/android
       new  c6809eb9278 Fix crashes in desktop-save-mode


Summary of changes:
 lisp/emacs-lisp/cconv.el            | 15 ++++++----
 lisp/emacs-lisp/edebug.el           | 22 +++++++-------
 lisp/emacs-lisp/testcover.el        |  5 ----
 lisp/emulation/viper-cmd.el         |  8 ++++-
 lisp/net/tramp-adb.el               | 13 ++-------
 lisp/net/tramp-sh.el                | 21 +++++---------
 lisp/net/tramp-sudoedit.el          | 13 ++-------
 lisp/net/tramp.el                   | 58 ++++++++++++++++++++++++-------------
 lisp/subr.el                        |  6 ++++
 src/androidfns.c                    | 37 +++++++++++++++++++++--
 test/lisp/emacs-lisp/cconv-tests.el | 13 +++++++++
 11 files changed, 132 insertions(+), 79 deletions(-)