feature/android updated (31883b8de11 -> 7c8cc9a633d)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  31883b8de11 * src/conf_post.h: Avoid macro redeclaration.
       new  c0a6f14f4a5 Update Android port
      adds  5af695c7479 ; * lib-src/etags.c (print_help): Fix indentation.
      adds  9c18af0cfaf * Warn when certain primitives are redefined (bug#61880)
      adds  2258ed01f42 ; Minor fix of last change
      adds  5b8e0b31548 Fix tramp-sh-handle-insert-directory
      adds  80e1037df44 Add string-interpolation feature to bash-ts-mode
      adds  b1b3af5b90b Update to Org 9.6.1-40-g3d817c
      adds  75cdc1afbe5 ; Change font-lock-variable-name-face to 
font-lock-variable-use-face
      adds  7292b24c801 Fix c-ts-mode indentation
      adds  d724d7d6785 Fix c-ts-mode indentation
      adds  1c67e4f895f Fix c-ts-mode indentation
      adds  aad617870b4 Merge from origin/emacs-29
       new  7c8cc9a633d Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 doc/misc/org.org                                   |   3 +-
 etc/refcards/orgcard.tex                           |   4 +-
 java/org/gnu/emacs/EmacsNative.java                |   1 +
 java/org/gnu/emacs/EmacsView.java                  |  29 +++-
 lib-src/etags.c                                    |   4 +-
 lisp/emacs-lisp/comp.el                            |  11 ++
 lisp/net/tramp-sh.el                               |   4 +-
 lisp/org/org-clock.el                              |  10 +-
 lisp/org/org-version.el                            |   2 +-
 lisp/org/org.el                                    |  64 ++++----
 lisp/progmodes/c-ts-mode.el                        |  35 +++--
 lisp/progmodes/sh-script.el                        |   9 +-
 src/android-asset.h                                |   8 +
 src/android.c                                      | 150 +++++++++++++++++-
 src/android.h                                      |  26 ++-
 src/androidgui.h                                   |   1 +
 src/androidterm.c                                  |  26 +++
 src/fileio.c                                       | 174 ++++++++++++++-------
 src/frame.h                                        |   1 +
 src/textconv.c                                     |  43 +++++
 src/textconv.h                                     |   1 +
 .../c-ts-mode-resources/indent-preproc.erts        |  19 +++
 .../lisp/progmodes/c-ts-mode-resources/indent.erts |  16 ++
 23 files changed, 521 insertions(+), 120 deletions(-)