Merge remote-tracking branch 'origin/master' into feature/pgtk

1 files changed, 12 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e8e0c910ef0..9eee04b3399 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -85,8 +85,8 @@ To get the old monospaced mode line back, customize the
 'mode-line-active' and 'mode-line-inactive' faces not to inherit from
 the 'variable-pitch' face, or add this to your "~/.emacs":
 
-  (set-face-attribute 'mode-line-active nil :inherit 'mode-line)
-  (set-face-attribute 'mode-line-inactive nil :inherit 'mode-line)
+    (set-face-attribute 'mode-line-active nil :inherit 'mode-line)
+    (set-face-attribute 'mode-line-inactive nil :inherit 'mode-line)
 
 
 * Changes in Emacs 29.1
@@ -556,8 +556,8 @@ user options that are no longer needed are now obsolete:
 *** Navigation and marking commands now work in image display buffer.
 The following new bindings have been added:
 
-  n / SPC   image-dired-display-previous-thumbnail-original
-  p / DEL   image-dired-display-next-thumbnail-original
+  n / SPC   image-dired-display-next-thumbnail-original
+  p / DEL   image-dired-display-previous-thumbnail-original
   m         image-dired-mark-thumb-original-file
   d         image-dired-flag-thumb-original-file
   u         image-dired-unmark-thumb-original-file
@@ -610,6 +610,12 @@ The command 'bookmark-set' (bound to 'C-x r m') is now supported in
 the thumbnail view, and will create a bookmark that opens the current
 directory in Image-Dired.
 
+---
+*** New user option 'image-dired-marking-shows-next'.
+If this option is non-nil (the default), marking, unmarking or
+flagging an image in either the thumbnail or display buffer shows the
+next image.
+
 +++
 *** 'image-dired-show-all-from-dir-max-files' has been increased to 500.
 This option controls asking for confirmation when starting Image-Dired
@@ -718,10 +724,11 @@ Emacs buffers, like indentation and the like.  The new ert function
 
 * Incompatible Lisp Changes in Emacs 29.1
 
-** User option 'mail-source-ignore-errors' is now obsolete
+** User option 'mail-source-ignore-errors' is now obsolete.
 The whole mechanism for prompting users to continue in case of
 mail-source errors has been removed, so this option is no longer
 needed.
+
 ** Fonts
 
 ---