]> git.eshelyaron.com Git - emacs.git/commit
Fix hang after failed yank-media on Android
authorPo Lu <luangruo@yahoo.com>
Wed, 8 May 2024 08:03:49 +0000 (16:03 +0800)
committerEshel Yaron <me@eshelyaron.com>
Wed, 8 May 2024 16:53:00 +0000 (18:53 +0200)
commit67061c5a643ca775440c8e1da87d727e8f4b2dd8
treee46d64804465f25b5b3ba8bd1bf475b0ed8eb531
parent3ffde9ab339edc9f41081707e227863bf381b730
Fix hang after failed yank-media on Android

* java/org/gnu/emacs/EmacsClipboard.java (getClipboardTargets)
(getClipboardData):

* java/org/gnu/emacs/EmacsSdk11Clipboard.java
(getClipboardTargets, getClipboardData):

* java/org/gnu/emacs/EmacsSdk8Clipboard.java
(getClipboardTargets, getClipboardData): Return string data as
Strings rather than byte arrays.

* src/androidselect.c (android_init_emacs_clipboard)
(Fandroid_get_clipboard_targets): Adjust to match.
(extract_fd_offsets): Remove duplicated semicolon.
(Fandroid_get_clipboard_data): Call unblock_input before
returning if extract_fd_offsets fails.

(cherry picked from commit e020f4e9ce5d98438033fea098d943c311b0fa3d)
java/org/gnu/emacs/EmacsClipboard.java
java/org/gnu/emacs/EmacsSdk11Clipboard.java
java/org/gnu/emacs/EmacsSdk8Clipboard.java
src/androidselect.c