Reinforce bitmap reconfiguration on Android

* java/org/gnu/emacs/EmacsView.java (EmacsView) <unswapped>: New
field in which to record whether the back buffer has received
contents beyond those present at the last buffer swap.
<dimensionsLock>: Delete field.
(onAttachedToWindow, onLayout, handleDirtyBitmap)
(prepareForLayout): Rather, synchronize window dimensions with
the view.
(getCanvas, getBitmap): Do not reconfigure the back buffer
bitmap if such outstanding data exists.
(postSwapBuffers): New function.
(swapBuffers): If such outstanding data exists and the back
bufferis pending reconfiguration, recreate the back buffer and
report exposure.

* src/androidterm.c (handle_one_android_event): Fix indentation.

(cherry picked from commit 82f0014273193d27c71a1fcb9be778c85cfa5e65)

; Skip commit 6aa5068ac71cb1b8e46c299138f99fea44319146

* lisp/outline.el: Keep point on the same outline after revert.

(outline-hidden-headings-paths): Return the current path as well.
(outline-hidden-headings-restore-paths): Move point to the path
that was current before reverting the buffer (bug#71466).
(outline-revert-buffer-restore-visibility):
Handle both values returned from outline-hidden-headings-paths.

(cherry picked from commit 7be66d8223e49489b2803c0ff027f1824d774441)

; Translate comment to English

* lisp/progmodes/php-ts-mode.el
(php-ts-mode--parent-html-heuristic): Translate comment to English.

(cherry picked from commit f18a915690c48119daaecf5b8684c46129496866)

; Fix typos

(cherry picked from commit c0eefebabfee011f0ec7631d055e482e4965a24d)

Tramp: handle non-standard file system like GPFS

* doc/misc/tramp.texi (Frequently Asked Questions):
Explain tramp-use-file-attributes.

* lisp/net/tramp.el (tramp-use-file-attributes): New defcustom and
defsubst.
(tramp-skeleton-file-exists-p):
* lisp/net/tramp-adb.el (tramp-adb-handle-file-executable-p)
(tramp-adb-handle-file-readable-p):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-file-executable-p)
(tramp-sudoedit-handle-file-readable-p)
(tramp-sudoedit-handle-file-writable-p): Use it.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-executable-p)
(tramp-sh-handle-file-readable-p)
(tramp-sh-handle-file-writable-p): Use it.
(tramp-sh-handle-set-file-acl): Fix property name.

(cherry picked from commit 90234ba7f024f3dae342689b47930835e4904503)

Fix clipboard request on macOS for yank-media

'yank-media' makes a request with 'CLIPBOARD and 'TARGETS, which on
other platforms returns the type(s) of the current selection, but on
macOS returned the selection itself.  Make it return the types instead.

This fixes (Bug#71377).

* src/nsselect.m (ns_get_local_selection): Return nil when called with
QCLIPBOARD and QTARGETS, so that 'ns_get_foreign_selection' is called to
return the type(s) of the selection.

(cherry picked from commit 275a5582414c2f63bccce896200b4e84f1ba0d75)

; Skip which-key merge commits

Generalize minibuffer-action/apply to non-completion minibuffers

(describe-{function,command,variable,symbol,keymap}): Add action

Fix Bug#71603

Correct 'bookmark-display'

Add 'minibuffer-action' to 'imenu'

New command 'minibuffer-apply-and-cycle-completion'

Fix Bug#52389

Minor adjustments to battery.el on Android

* src/android.c (android_query_battery):

* java/org/gnu/emacs/EmacsService.java (queryBattery19)
(queryBattery): Reorder items in value for consistency with
Fandroid_query_battery.

* lisp/battery.el (battery-status-function): Select
battery-android only when android-query-battery is present.
(battery-android): Return temperature and correct values of
power source constants.

(cherry picked from commit a39f6480ea5b6d3f81db90808123cdeb54790787)

Fix Eshell "which" test on MS-Windows

* test/lisp/eshell/esh-cmd-tests.el
(esh-cmd-test/which/plain/external-program): Compare the file name
case-insensitively on case-insensitive file systems.

* test/lisp/eshell/eshell-tests-helpers.el
(eshell-command-result--equal): Revert to the previous implementation.

(cherry picked from commit aefcccc1d411c973a3275959d7fa340d77f9157e)

Simplify bitmap reallocation on Android

* java/org/gnu/emacs/EmacsView.java: Update outdated commentary.
(handleDirtyBitmap): Don't copy contents of the previous bitmap
to the new.
(onLayout): Unconditionally expose upon layout changes.

(cherry picked from commit 8d60b6bab8b95e4f3b350a8b093e8f60e3f83f69)

Document unavailability of color fonts on Android

* doc/emacs/android.texi (Android Fonts): Document absence of
support for color fonts.

(cherry picked from commit 3241d6cfbfeca48fbd5dc12dbf56c21688e9dce4)

Account for duplicate removal on restoring eww-history-position

* lisp/net/eww.el (eww-desktop-misc-data): Add :history-position
(eww-restore-desktop): Use it.
(desktop-locals-to-save): Remove the raw variable.

(cherry picked from commit 65b7f87a31da2e78285c5eb1ee2b2b38fc349361)

Fix em-extpipe-tests on MS-Windows

* test/lisp/eshell/em-extpipe-tests.el (em-extpipe-test-14): Fix
test on MS-Windows (bug#71446).

(cherry picked from commit 2c201bbba5c43328979bf139330684cacfa074f3)

Fix 'wrong-type-argument' in 'php-ts-mode--webserver-read-args'

Prevents php-ts-mode--webserver-read-args from throwing an
error if the current buffer is not associated with a file.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--webserver-read-args):
Use 'default-directory if' the current buffer is not associated
with a file.  (Bug#71574)
(php-ts-mode-run-php-webserver): Fix doc string.

(cherry picked from commit 13c4fc3dc72d87af89d92f40808cf4f1285eddab)

Update to Org 9.7.4-7-g165319

(cherry picked from commit 0910f6fe3f701caa478d4aa08d9667316050b977)

; Improve last change

* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill-pipeline): Fix
check of exit message and ensure we have only one prompt.

(cherry picked from commit 03ad06737bd229a731ee1d36e245daf34fd7a73b)

; Add command logging to some more Eshell tests

* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill-pipeline)
(esh-proc-test/kill-pipeline-head): Write debug logs on failure.

(cherry picked from commit 7df855cdfe617614dbe23fb0302a647ee23589ea)

Unify 'minibuffer-hint-mode' and 'completions-auto-update-mode'

Avoid byte-compilation warnings in php-ts-mode

* lisp/progmodes/php-ts-mode.el (treesit-search-forward)
(treesit-node-prev-sibling, treesit-node-first-child-for-pos):
Declare.

(cherry picked from commit 9b2e1b5e16c233cf5ea039e17175580793a4e5ef)

Honor 'Info-additional-directory-list' in 'C-h R' completion

* lisp/info.el (info--manual-names): Take into account
'Info-additional-directory-list', in addition to
'Info-directory-list'.  (Bug#71368)

(cherry picked from commit 83182b2c4a4e039884ee54ddce6e657f4fb888eb)

; * doc/emacs/package.texi (Package Files): Fix wording.

(cherry picked from commit 2d67ea86320c6adbb95a1a94a47037cb3d62dec1)

Fix problem with recently-added defcustom's

* lisp/progmodes/php-ts-mode.el (php-ts-mode-php-config)
(php-ts-mode-ws-port, php-ts-mode-ws-document-root)
(php-ts-mode-ws-workers): Fix :type and :safe attributes.
(Bug#71566)

(cherry picked from commit 9e8c0ec9918af12aafa1063ad3bc3f9f1d180e6f)

Better documentation of 'emacs-internal' encoding

* doc/lispref/nonascii.texi (Coding System Basics): Recommend
'emacs-internal' encoding for caching.

(cherry picked from commit 2cbea4f35cbfb25f53f23ebba81ffe89ce77b136)

; * lisp/textmodes/ispell.el (ispell-aspell-find-dictionary): Doc fix.

(cherry picked from commit d802e56182042e32a56ef8515f9ef01c0633be1e)

; Fix some docstrings. (bug#71532)

(cherry picked from commit d05f473285de734fd1a30a7ee69f36303d5ecb7c)

Fix doc strings in ispell.el

* lisp/textmodes/ispell.el (ispell-check-version)
(ispell-get-casechars, ispell-get-not-casechars)
(ispell-get-otherchars, ispell-get-many-otherchars-p)
(ispell-get-ispell-args, ispell-get-extended-character-mode)
(ispell-get-coding-system, ispell-word, ispell-get-word)
(ispell-pdict-save, ispell-command-loop, ispell-help)
(ispell-filter, ispell-highlight-spelling-error)
(ispell-change-dictionary, ispell-region, ispell-ignore-fcc)
(ispell-get-line, ispell-message): Doc fixes (bug#71532)

(cherry picked from commit 45a191738c661d6161ec82a4664bf8bee387219c)

Fix calc-trail-here for first line of trail.

* lisp/calc/calc.el(calc-trail-here): Change 'or' to 'and'
since (bobp) can return true even if the buffer is not empty.
(Bug#71533)

(cherry picked from commit c637adbf32f2566b739eb96e68546201c55540af)

Allow escape sequences in Python prompts

* lisp/progmodes/python.el (python-shell-prompt-detect): Use
Python's json package if available, and remove escape sequences
in prompts.
* test/lisp/progmodes/python-tests.el
(python-tests-interpreter-2-6-higher-p): New predicate
function.
(python-shell-prompt-detect-7): New test.  (Bug#71440)

(cherry picked from commit af6e7ed4c1aa5fae34eda3507a4baf8b52c97312)

Fix 'reindent-then-newline-and-indent' with 'abbrev-mode'

* lisp/simple.el (reindent-then-newline-and-indent): Use a marker
for the initial position.  (Bug#71459)

(cherry picked from commit ffa349f983fa5c754fd7751c0757f6c704fbfe5a)

Prevent deletion of separator in *edit string* buffer

* lisp/textmodes/string-edit.el (string-edit): Make the separator
line read-only.  (Bug#71405)

(cherry picked from commit 6d12157fa85a12208555e291321af97a09243962)

Fix electric-pair-mode when characters are bound to non-ASCII keys

* src/cmds.c (Fself_insert_command): Record the argument C in
'last-command-event'.  (Bug#71337)

(cherry picked from commit 988203fe980e3c80f736ad0b6aae9f288ebfa0f1)

; * nt/README.W32: Remove Windows 95.

(cherry picked from commit 8d67bdae59425fbc7dccd35b89c019c7757c1acd)

; * nt/README: Remove Windows 95.

(cherry picked from commit f0f0f0fe43480a3df6c43ed52f910197041274f7)

Send proper substitution character to Android IMEs

* src/androidterm.c (android_text_to_string): Substitute
REPLACEMENT CHARACTER for NULL in converting characters not
representable without surrogate pairs to UTF-16.

(cherry picked from commit 25452986cbcf3db02cf0b5b624a03bc146b5d80c)

typescript/tsx-ts-mode: Indentation for type parameters

* lisp/progmodes/typescript-ts-mode.el
(typescript-ts-mode--indent-rules): Add rule for type_parameters.

(cherry picked from commit 1079d333ab7cb24b81e7ebc4087d2a11baa0097e)

Fix auth-info-password

* lisp/auth-source.el (auth-info-password): :secret can be a
cascaded function.

(cherry picked from commit 59261e6f4fef0ec03c8127b29fe107ed19280a3b)

; * lisp/mail/rmail.el (rmail-get-new-mail-hook): Doc fix.

(cherry picked from commit 778f8c793d1c621fc8219644797ef44425bf0bb4)

; Minor fixes in ELisp manual

* doc/lispref/searching.texi (Regexp Search): Caveat about using
'search-spaces-regexp'.  (Bug#71429)
* doc/lispref/help.texi (Keys in Documentation): Fix markup.

(cherry picked from commit e6044b29e65d3639c267bf4753391c7cc57106cf)

New commands for minibuffer history control

* lisp/minibuffer.el (minibuffer-alternate-history)
(minibuffer-kill-from-history): New commands.
(minibuffer-local-map): Bind them.
(minibuffer-hint-mode): Make interactive.
(minibuffer-action-history): New variable.
(minibuffer-set-completion-action): Use it, new command.
(minibuffer-local-completion-map): Bind them.
(minibuffer-apply): Use 'completion-identity', if present.
(read-history-variable-history): New variable.
(read-history-variable): Use it.

New command 'ignore-string'

Fix 'minibuffer-default-add-function' default value

; * src/insdel.c (insert_from_gap_1): Update commentary.

(cherry picked from commit 47746c1f3737fe3e079ceefc496e9601b6dbef32)

; Update comments in a recent commit

* src/process.c (read_and_insert_process_output):
* src/insdel.c (insert_from_gap):
* src/coding.h (struct coding_system): Improve comments (bug#71525).

(cherry picked from commit 0372ce5f60c18956738a31985569b86444d52ec5)

; Fix Icomplete error during candidate highlighting

* lisp/icomplete.el (icomplete-completions): Pass completion
candidates through 'completion-lazy-hilit' before trimming
common prefix, rather than after.

https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00271.html
(cherry picked from commit 3b07d33059150671d0af1cc7b51fa7c8cc4b4ea1)

"Insert before markers" in read_and_insert_process_output properly

* src/coding.c (setup_coding_system): Initialize it.
(produce_chars, encode_coding, decode_coding_gap):
Obey it in insert_from_gap calls.
(encode_string_utf_8, decode_string_utf_8): Update the other calls
to insert_from_gap to have one new argument (false).

* src/coding.h: New field insert_before_markers.

* src/decompress.c (Fzlib_decompress_region): Here too.

* src/insdel.c (insert_from_gap):
Accept new argument BEFORE_MARKERS (bug#71525) and pass it through
to adjust_markers_for_insert.

* src/lisp.h: Update prototype.

* src/process.c (read_and_insert_process_output):
Set process_coding->insert_before_markers instead of calling
adjust_markers_for_insert.

(cherry picked from commit a8d5c5fd8789f28ddd040e497f03a988e5f0703c)

* lisp/progmodes/project.el: Bump the version

(cherry picked from commit 08e38818f6ff4e514ac291bc5a7686f4390759b0)

Fix generation of org.texi from org.org

* doc/misc/Makefile.in (org_template): Bind
'org-id-track-globally' to nil when running
'org-texinfo-export-to-texinfo-batch', to avoid searching local
user files when building the Org manual.

(cherry picked from commit 6a9f1b504a5a3c096afd17f3b8f8ebeca6a03ed5)

Correct last change

* lisp/term.el (term-generate-db-directory): Don't delete
DST-DIRECTORY if not yet existent.

(cherry picked from commit 11b145ac070217891b7ec939ce7821253887dac1)

Port term.el's terminfo machinery to Android

* lisp/term.el (term-generate-db-directory): New function.  Copy
/assets/etc/e to the cache directory, on Android, and return the
same.
(term-exec-1): Call term-generate-db-directory in place of
data-directory.

(cherry picked from commit f66341a13be57bec6c89f75d26444b42ca3f1ecf)

Unconditionally prefer built-in decompression functions on Android

* lisp/jka-compr.el (jka-compr-insert-file-contents): Prefer
built-in decompression functions (i.e., zlib) to external
agents.

(cherry picked from commit 9c9afd5235782bd987dea12ab89fd91e661ec89e)

; * lisp/eshell/em-script.el (eshell-execute-file): Improve docstring.

(cherry picked from commit 19b407ac749fcb8d978e8263ed98328100128de5)

Restore file's original name after a failed rename_replace on Windows 9X

* src/w32.c (sys_rename_replace): If the rename operation fails
and an intermediate name was generated and applied to the input
file, restore the original.

(cherry picked from commit a458dc5dc828cfbe5d74226d6ef45a3d205cb7d8)

Enable compiling Emacs with implicit Make rules suppressed

* lib/Makefile.in (.SUFFIXES):

* lwlib/Makefile.in (.SUFFIXES):

* oldXMenu/Makefile.in (.SUFFIXES):

* src/Makefile.in (.SUFFIXES): Register .c as a default suffix,
for this list is emptied when `-r' is provided to Make.

(cherry picked from commit 4124b98509bf049a3ccf0f7319b7edf7cae3b6a0)

Fix file listing in submodules with project-files-relative-names=t

* lisp/progmodes/project.el (project--vc-list-files):
Prepend module names to files when project-files-relative-names is
non-nil (bug#71538).

(cherry picked from commit 2dae603c4140a0a449b2ddaf572fe94de3908f31)

; Minor editorial fixes to some Eshell tests

* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test/kill-process/redirect-message): Move next to its sibling
tests.
(esh-proc-test/remote/remote-path): Rename from 'esh-var-test/...'.

(cherry picked from commit 4973801c198a4292992b7df0488b3d467c99571e)

; Skip commit 56537ab0228262e96bf75f351642d8aaaa8097f7

;cperl-mode.el: Avoid false positives when parsing new Perl syntax

* lisp/progmodes/cperl-mode.el (cperl--package-for-imenu-rx)
(cperl--class-for-imenu-rx): avoid false positives when collecting
imenu entries
* lisp/progmodes/cperl-mode.el (cperl-init-faces): avoid false
positives when detecting package names

* test/lisp/progmodes/cperl-mode-tests.el
(cperl-test-imenu-index): Add test verifying that $class_false is
not shown as a class _false

* test/lisp/progmodes/cperl-mode-resources/grammar.pl: Add a line
containing a false positive "$class_false"

(cherry picked from commit 39e3c30b514c21854f7fcc87c3a461bd9e81cbdb)

; * src/androidterm.c (android_term_init): Typo.

(cherry picked from commit 14f7506c99b19abe411d140c3f09dbf1de63a4b6)

php-ts-mode: minor fixes

* lisp/progmodes/php-ts-mode.el (php-ts-mode-flymake-php):
Don't use `any` to mean `not-newline`; it's misleading.
(php-ts-mode--predefined-constant): Remove duplicate "E_USER_NOTICE".

(cherry picked from commit 59367f6a3a9dd7fb30429494b622ebdec94e6e32)

; * src/w32proc.c (sys_kill): Handle negative PID when sig == 0.

(cherry picked from commit 72e6b05221502cf722f7bddf2d100e5eff424dd8)

Adapt emacsclient options in doc

* doc/emacs/misc.texi (emacsclient Options):
* doc/man/emacsclient.1: Adapt option list.

(cherry picked from commit 8eeb159b95130a0dc29040ffa9f330874576964e)

Fix removal of file locks on MS-Windows 9X

A new Windows-specific function for validating process ID
is introduced that does TRT with possibly negative PID
values returned by 'getpid' on Windows 9X and also with
values larger than INT_MAX, since PID on Windows is
actually an unsigned 32-bit value.
* src/w32proc.c (w32_valid_process_id): New function.
* src/w32common.h (VALID_PROCESS_ID): Define for WINDOWSNT.
* src/filelock.c [WINDOWSNT]: Include w32common.h.  (Bug#71477)

(cherry picked from commit 0007231a7805abce945349c7c9c75b45155bda5c)

Correctly define `select' binding on Android

* lisp/term/android-win.el (input-decode-map): Cease binding
select in the initial frame's input-decode-map.

* src/androidterm.c (android_term_init): Binding select in the
freshly created kboard.
(syms_of_androidterm) <Qselect, Qreturn>: New symbols.

(cherry picked from commit 94bcd7964bbb20bc8ff8a91a9656452a97139d60)

; Skip commit 6b7ff60a5e71c161a064e27509fe4fb95cf74ddd

Release ERC 5.6

* lisp/erc/erc.el: Change Version header from 5.6-git to 5.6.  A
`customize-package-emacs-version-alist' mapping for ERC 5.6 to Emacs
30.1 was already added when moving from 5.5 to 5.6-git.  The ERCVER
variable in doc/misc/erc.texi was likewise updated at that time.
Going forward, such changes will continue to happen preemptively, on
the flip side of each release.
(erc-version): Change version from 5.6-git to 5.6.

(cherry picked from commit d1e98a8f0128747030e97ffea20a8f67aa0cd923)

; Amend some doc strings in ERC

* lisp/erc/erc-backend.el (define-erc-response-handler): Mention
important distinction between aliases for handlers and hooks, and note
expected type for the latter.
* lisp/erc/erc.el (erc--define-channel-user-status-compat-getter):
Mention that these accessors are not inlined like those generated by
`cl-defstruct'.

(cherry picked from commit bbac7b9fa398254e64e5ee3e8aca2f59adcfda50)

; Mention new modes in the Emacs user manual

* etc/NEWS: Mark new modes as documented.
* doc/emacs/programs.texi (Program Modes): Add PHP.  (Bug#71380)
Add other new modes.

(cherry picked from commit e00af96c0691b749932756e47f48a53f5e92a00f)

Add php-ts-mode

* etc/NEWS: Mention the new mode.
* lisp/progmodes/php-ts-mode.el: New file.  (Bug#71380)

(cherry picked from commit e37754fc59bac409881d456a83aa0bf2468c94fb)

Start of a fix for bug#71477

* src/filelock.c (integer_prefixed): New static function.
(VALID_PROCESS_ID): New macro.
(current_lock_owner): Use them to allow negative process IDs
on some Microsoft platforms.

(cherry picked from commit ac14d56a4d749661a9c52941e6511a0c300d35e4)

Fix misspelled symbols in artist.el

* lisp/textmodes/artist.el (artist-key-undraw-continuously)
(artist-key-draw-continuously)
(artist-key-do-continuously-continuously)
(artist-key-do-continuously-poly)
(artist-key-do-continuously-1point)
(artist-key-do-continuously-2points)
(artist-key-do-continuously-common)
(artist-key-set-point-continuously)
(artist-mouse-draw-continuously): Rename functions to fix misspelling of
"continuously".  Leave old function names as obsolete aliases and update
all callers.
(artist-mt, artist-go-get-undraw-fn, artist-go-get-interval-fn)
(artist-go-get-fill-pred, artist-go-get-fill-fn)
(artist-key-undraw-common, artist-key-draw-common)
(artist-key-do-continously-common, artist-key-set-point-common)
(artist-down-mouse-1): Rename symbol to 'artist-do-continuously' to fix
misspelling of "continuously".  Continue supporting the old symbol for
backwards-compatibility.

(cherry picked from commit b8873a7080f25e47b16cf21d92d64698b5e377fb)

(read-library-name): Ignore *-autoloads.el files.

Remove 'self-insert-and-exit'

Mark some minibuffer-specific commands as such

Maintain a stack of minibuffer partial completion inputs

; * lisp/menu-bar.el (kill-this-buffer): Another doc fix (bug#71510).

(cherry picked from commit 6893c327e982528fdc93e3a956a4b6830a09ea3f)

; * etc/NEWS: Add doc markup for char-to-name

(cherry picked from commit 3905db6e3aa947b847c072259ad6d08c8a15e10e)

Support --no-window-system option in emacsclient

* lib-src/emacsclient.c (print_help_and_exit, longopts): Add
'--no-window-system' alias for -t.  (Bug#71509)

(cherry picked from commit ebb0a3036d2256c214b3116b029ecbcc63040be0)

; * lisp/menu-bar.el (kill-this-buffer): Doc fix (bug#71510).

(cherry picked from commit c4a6b9dbfeee8a345f8761f86b7f89dd0ba9bbe4)

Fix tramp-compat-auth-info-password

* lisp/net/tramp-compat.el (tramp-compat-auth-info-password):
Use original function only for Emacs 30+.

(cherry picked from commit 9c2fad55fd2725da5bf30677d07541f6f6d1c45b)

Simplify 'ask-user-about-lock'

Restore omitted dependency

* java/Makefile.in (install_temp): Depend on
$(libsrc)/asset-directory-tool.

(cherry picked from commit 6d64cf5ee1bf67e84f7e338b5de5aa139193d2e7)

Fix info/DIR generation broken by update to Org manual

* build-aux/make-info-dir: Adapt to latest changes in Org manual's
markup.

(cherry picked from commit eb5aafb0f4cf7d2f5f12e2eb3a4324c3d5834db7)

Restore functionality on Android 2.2

* java/Makefile.in (install_temp): Do not compress
directory-tree and generate such files in a special format that
stores file sizes.

* lib-src/asset-directory-tool.c (struct directory_tree): New
field st_size.
(need_file_size): New variable.
(main_1, main_2, main): Write file sizes before sibling offsets
if `--api-8' is specified.

* src/android-asset.h (struct android_asset_manager): New field
open.
(struct android_asset): New field name.
(AAssetManager_fromJava): Load AssetManager#open.
(AAssetManager_open): If a directory tree has already been
loaded, search for a matching asset and load its size thence, to
avoid the requirement of an AssetFileDescriptor.
(AAsset_close): Don't assume asset->fd exists.  Release
asset->name.
(AAsset_getLength): Likewise.
(android_asset_create_stream): If asset->name exists, call
AssetManager#open, in order to open compressed files.

* src/androidvfs.c (OLD_ANDROID_ASSETS): Define to 1 on API 8.
(android_extract_long, android_scan_directory_tree): Mark
arguments as const.  Adjust offsets when OLD_ANDROID_ASSETS.
(android_is_directory, android_init_assets, android_afs_readdir):
Likewise.

* src/lread.c (lread_fstat): Define to sys_fstat, not fstat.

(cherry picked from commit 02e70821b3800a082aec215a9ab8adbfafe9ad76)

; Fix defcustoms in dired-aux.el

* lisp/dired-aux.el (dired-backup-overwrite)
(dired-create-destination-dirs)
(dired-create-destination-dirs-on-trailing-dirsep)
(dired-vc-rename-file, dired-do-revert-buffer)
(dired-isearch-filenames, dired-confirm-shell-command): Fix doc
strings and customization tags.

(cherry picked from commit af9bf86bd74d36f3a94187a47986efe0e2703a73)

; * doc/emacs/maintaining.texi (VC Change Log): Fix recent change.

(cherry picked from commit 05fe419deb5784c773f37df2bde9c3cba48c0e9a)

; * java/Makefile.in: Fix typo.

(cherry picked from commit f543ec18f44fa64d06e1ab45e1484326f8451ebe)

Improve compression of Emacs packages on Android 2.2

* configure.ac (ZIP): Search for a `zip' executable and
substitute the same if targeting SDK 8.

* java/INSTALL: Document new requirement.

* java/Makefile.in (GZIP_PROG, ZIP): New substitutions.
(.PHONY): Delete references to directory-tree.

(install_temp): On SDK 8 and earlier, compress large *.el and
Info files with gzip, and divide install_temp into three
separate directories, with one for large files, another for
gzipped files, and one more for the remainder.
(install_temp/assets/directory-tree, install_temp/assets/version)
(install_temp/assets/build_info): Merge these rules into
install_tmp, that they may execute before the assets directory
is split.
(emacs.apk-in): Package each directory separately, accounting
for their varied compression requirements.

* lisp/term/android-win.el (input-decode-map): Define select to
return in input-decode-map.

(cherry picked from commit 5fc75b051fc623a4f614a7abe09f08d127ed9ccd)

Make C-u 1 C-x v L slightly more discoverable

* doc/emacs/maintaining.texi (VC Change Log): List C-u 1 C-x v L
as though it were a separate command.  Give the longer
description its own paragraph.

(cherry picked from commit a300db7ad4a16dc39bf1793c2e61f75145337ec6)

Fix customisation buffer for dired group

* lisp/dired-aux.el
(dired-create-destination-dirs-on-trailing-dirsep): Actually
concat the string.  (Bug#71490)

(cherry picked from commit 076e8ad5fc518e93dc7ab23b9dee007205580fbe)

read_and_insert_process_output: Insert before markers

* src/insdel.c (adjust_markers_for_insert): Make non-static.

* src/lisp.h: Add declaration for it.

* src/process.c (read_and_insert_process_output): Use it here.
And also call insert_1_both with BEFORE_MARKERS=t, for
compatibility with internal-default-process-filter (bug#66020).

(cherry picked from commit 3199b8584e4583a4b74263f5704a21c3431658c2)

Refactor tramp-*-process-file functions

* lisp/net/tramp-adb.el (tramp-adb-handle-make-process):
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't compute
process name, this is done in `tramp-skeleton-make-process'.

* lisp/net/tramp-adb.el (tramp-adb-handle-process-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-process-file):
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file):
Use `tramp-skeleton-process-file'.

* lisp/net/tramp.el (tramp-get-unique-process-name): New defun.
(tramp-skeleton-make-process): Use it.
(tramp-skeleton-process-file): New defmacro.

(cherry picked from commit 5ecff95993d5edbffb27e14c2815d2b23003bcb4)

; * src/emacs.c (Fkill_emacs): Doc fix.

(cherry picked from commit 4b902f5031e72ae913d69da9f60528f75b6e5860)