diff options
| author | Eli Zaretskii | 2023-09-30 13:50:07 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-09-30 13:50:07 -0400 |
| commit | 46978fa1eff286ea15248ee358fe62608ca070c5 (patch) | |
| tree | a9cce889b60229e11006585e276a018719e5fdad /java/org | |
| parent | e6dd64aaba55b93340de1d7e0d6783da6de2af2f (diff) | |
| parent | 4776d90c31b3d5bc4117ca7ecde95444adf402ac (diff) | |
| download | emacs-46978fa1eff286ea15248ee358fe62608ca070c5.tar.gz emacs-46978fa1eff286ea15248ee358fe62608ca070c5.zip | |
Merge from origin/emacs-29
4776d90c31b Add new Tramp test
ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
7447d3df94e Fix tree-sitter indentation conflict with multiple languages
bee18e52737 Fix bug#66093 in Tramp
7d5fee0feaa Support regeneration of ja-dic.el under '--with-small-ja-...
Conflicts:
make-dist
Diffstat (limited to 'java/org')
| -rw-r--r-- | java/org/gnu/emacs/EmacsDesktopNotification.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsDesktopNotification.java b/java/org/gnu/emacs/EmacsDesktopNotification.java index 56ed984d497..4a6bbf7a606 100644 --- a/java/org/gnu/emacs/EmacsDesktopNotification.java +++ b/java/org/gnu/emacs/EmacsDesktopNotification.java | |||
| @@ -137,7 +137,7 @@ public final class EmacsDesktopNotification | |||
| 137 | priority = Notification.PRIORITY_HIGH; | 137 | priority = Notification.PRIORITY_HIGH; |
| 138 | break; | 138 | break; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | notification = (new Notification.Builder (context) | 141 | notification = (new Notification.Builder (context) |
| 142 | .setContentTitle (title) | 142 | .setContentTitle (title) |
| 143 | .setContentText (content) | 143 | .setContentText (content) |