From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 27 Jul 2023 14:52:38 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e055c635b0d73efe3826e418690a3d91eee69647;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

e055c635b0d73efe3826e418690a3d91eee69647
diff --cc etc/NEWS
index 44ffbaf78f2,a8e7d97df7e..39b4a35930a
--- a/etc/NEWS
+++ b/etc/NEWS
@@@ -567,16 -567,11 +567,21 @@@ Similarly to buffer restoration by Desk
  of the accessibility of remote files can now time out if
  'remote-file-name-access-timeout' is set to a positive number.
  
 +** Notifications
 +
 ++++
 +*** Allow to use Icon Naming Specification for app-icon
 +You can use a symbol as the value for ':app-icon' to provide icon name
 +without specifying a file, like this:
 +
 +  (notifications-notify
 +    :title "I am playing music" :app-icon 'multimedia-player)
 +
+ ** Image Dired
+ 
+ *** New user option 'image-dired-thumb-naming'.
+ You can now configure how a thumbnail is named using this option.
+ 
  
  * New Modes and Packages in Emacs 30.1