summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2024-02-10 05:07:56 -0500
committerEli Zaretskii <eliz@gnu.org>2024-02-10 05:07:56 -0500
commit22d500ce21de56d1f17231ce8030dc5de12f021f (patch)
tree3d300ce9697a0b6fd85880a622ff856eb5aac42f /java
parent7f3baf352bad03de50135556a561af0c7fb1bd6a (diff)
parent7d3a144486461869b943f04a45e84c0c3d926732 (diff)
downloademacs-22d500ce21de56d1f17231ce8030dc5de12f021f.tar.gz
Merge from origin/emacs-29
7d3a1444864 ; Mention defface's and their :version tags in CONTRIBUTE. 09c53b717d4 * admin/notes/kind-communication: New file. 31ca4e5501f ; And another fix of CONTRIBUTE. d65499e7908 ; Another clarification in CONTRIBUTE. 571ec583d64 ; Clarify "ChangeLog entries" in CONTRIBUTE. e2682316867 Don't skip links to "." and ".." in Dired when marking files e25d11314d8 Pass unquoted filename to user-supplied MUSTMATCH predicate 47496993703 * doc/lispref/parsing.texi (Retrieving Nodes): Improve do... d0673ea0d42 ; * etc/PROBLEMS: Workaround for Windows key "stuck" (bug... * lisp/emacs-lisp/trace.el: * java/org/gnu/emacs/EmacsWindow.java (onDragEvent): Remove training whitespace.
Diffstat (limited to 'java')
-rw-r--r--java/org/gnu/emacs/EmacsWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index b75d96b2b5a..978891ba619 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -1746,7 +1746,7 @@ public final class EmacsWindow extends EmacsHandleObject
/* Attempt to acquire permissions for this URI;
failing which, insert it as text instead. */
-
+
if (uri != null
&& uri.getScheme () != null
&& uri.getScheme ().equals ("content")