aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEli Zaretskii2023-08-12 13:42:14 -0400
committerEli Zaretskii2023-08-12 13:42:14 -0400
commitb289f0769f0a43fdaabec41b92bacc51acbc4b9b (patch)
treeaf63ebaee6937d7bf1be228948d81681527f056c /java
parentde6c1c4d5c92b92d5b280e157c2a5bc3228749f2 (diff)
parent4767f5eaeedef57dfcc119399e5855f41c2e1be5 (diff)
downloademacs-b289f0769f0a43fdaabec41b92bacc51acbc4b9b.tar.gz
emacs-b289f0769f0a43fdaabec41b92bacc51acbc4b9b.zip
Merge from origin/emacs-29
4767f5eaeed Better fix for bug#65156 dd1d8414b33 Fix insert-file-contents with pipes and /dev/stdin 50649a6d1a2 ; * etc/PROBLEMS: Fix wording. f0dda682ffb ; * etc/NEWS.28: Add deletion of levents.el. f4acae842c0 Fix bug#65042 e1874c4e8bf * configure.ac (HAVE_TREE_SITTER): Set NEED_DYNLIB=yes (b... ef8838c3a5f * etc/NEWS: Mention tramp-show-ad-hoc-proxies. 495bee253fc * test/lisp/net/tramp-tests.el (tramp-test42-utf8): Skip ... de1effd73b4 ; Fix last change 7c7966862bc * test/lisp/net/tramp-tests.el (tramp-test10-write-region... 16205e8db65 ; Improve help-echo in package.el a95e7006989 ; Filter packages available for upgrade via menu bar adff72dd1d2 Fix reverting Rmail buffers
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 a1f70644e16..aff5046b22e 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -1356,7 +1356,7 @@ public final class EmacsWindow extends EmacsHandleObject
1356 if (on) 1356 if (on)
1357 view.showOnScreenKeyboard (); 1357 view.showOnScreenKeyboard ();
1358 else 1358 else
1359 view.hideOnScreenKeyboard (); 1359 view.hideOnScreenKeyboard ();
1360 } 1360 }
1361 }); 1361 });
1362 } 1362 }