mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 05:22:04 -08:00
Code Issues Projects Releases Wiki Activity

Fix hang after failed yank-media on Android

Browse source 
* 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.
This commit is contained in:
Po Lu 2024-05-08 16:03:49 +08:00
parent d0b36be59a
commit e020f4e9ce
4 changed files with 45 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/org/gnu/emacs/EmacsClipboard.java
View file

@ -32,8 +32,8 @@ public abstract class EmacsClipboard
public abstract boolean clipboardExists ();
public abstract byte[] getClipboard ();
public abstract byte[][] getClipboardTargets ();
public abstract AssetFileDescriptor getClipboardData (byte[] target);
public abstract String[] getClipboardTargets ();
public abstract AssetFileDescriptor getClipboardData (String target);
/* Create the correct kind of clipboard for this system. */