diff options
| author | Po Lu | 2024-07-01 18:12:40 +0800 |
|---|---|---|
| committer | Po Lu | 2024-07-01 18:12:40 +0800 |
| commit | 71530ab1ae2609812a32ac531812b57c7b1a40b6 (patch) | |
| tree | f969bee0b6c3ff85e9fb527fcd1896947822891d /java | |
| parent | 311c677343e825b0df807d11d4a2bbb146da8af1 (diff) | |
| parent | 1647494c04a57586c9616603b3ae803c6dd48d30 (diff) | |
| download | emacs-71530ab1ae2609812a32ac531812b57c7b1a40b6.tar.gz emacs-71530ab1ae2609812a32ac531812b57c7b1a40b6.zip | |
Merge from savannah/emacs-30
1647494c04a ; * etc/NEWS: Clarify.
b2c966f8396 ; * src/treesit.c (Ftreesit_query_capture): Fix typo.
ae385794206 * java/res/mipmap-v26/emacs_icon.xml: Define monospace icon.
b2d99c0d0aa Improve `sentence-end-double-space` docstring
# Conflicts:
# etc/NEWS
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/mipmap-v26/emacs_icon.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/res/mipmap-v26/emacs_icon.xml b/java/res/mipmap-v26/emacs_icon.xml index f0a8df92846..5b720e8210f 100644 --- a/java/res/mipmap-v26/emacs_icon.xml +++ b/java/res/mipmap-v26/emacs_icon.xml | |||
| @@ -20,4 +20,5 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> | |||
| 20 | <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | 20 | <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> |
| 21 | <background android:drawable="@drawable/emacs_background"/> | 21 | <background android:drawable="@drawable/emacs_background"/> |
| 22 | <foreground android:drawable="@drawable/emacs_foreground"/> | 22 | <foreground android:drawable="@drawable/emacs_foreground"/> |
| 23 | <monochrome android:drawable="@drawable/emacs_foreground"/> | ||
| 23 | </adaptive-icon> | 24 | </adaptive-icon> |