master 47c833537ac 2/3: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 47c833537ac7213ce1bb682b34025130d60b81f9
Merge: 545c363c624 1630bfb5d08
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    1630bfb5d08 Merge from origin/emacs-28
    e2ac0d416b9 ; Merge from origin/emacs-28
    068b53500e2 ; Improve image-dired-thumbnail-storage docstring
    497ed0fb42e ; * doc/emacs/dired.texi (Image-Dired): Fix last change.
    4aa397e71b2 More doc on image-dired-dired-* (bug#61624)
    893ddd5903e Eglot: improve treatment of completion items without :sor...
    4a77fcb1478 Update ChangeLog and AUTHORS for Emacs 28.3
    e339926272a Fix etags local command injection vulnerability
    5d05ea803e9 Fixed ctags local command execute vulnerability
    22fb5ff5126 Fix ruby-mode.el local command injection vulnerability (b...
    807d2d5b3a7 Fix htmlfontify.el command injection vulnerability.
    ae9bfed50db Fix storing email into nnmail by Gnus
---
 doc/emacs/dired.texi      | 40 +++++++++++++++++++++++++++-------------
 lisp/image/image-dired.el | 15 +++++++--------
 lisp/progmodes/eglot.el   |  7 +++----
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index cae8207990e..3f2c8d4afdf 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1655,11 +1655,11 @@ become available.
 @findex image-dired-display-previous
   With point in the thumbnail buffer, you can type @key{RET}
 (@code{image-dired-display-this}) to display the image in another
-window.  Use the arrow keys to move around in the thumbnail buffer.
-For easy browsing, use @key{SPC} (@code{image-dired-display-next}) to
-advance and display the next image.  Typing @key{DEL}
-(@code{image-dired-display-previous}) backs up to the previous
-thumbnail and displays that instead.
+window.  Use the standard Emacs movement key bindings or the arrow
+keys to move around in the thumbnail buffer.  For easy browsing, use
+@key{SPC} (@code{image-dired-display-next}) to advance and display the
+next image.  Typing @key{DEL} (@code{image-dired-display-previous})
+backs up to the previous thumbnail and displays that instead.
 
 @vindex image-dired-external-viewer
   Type @kbd{C-@key{RET}}
@@ -1669,9 +1669,19 @@ in an external viewer.  You must first configure
 
   You can delete images through Image-Dired also.  Type @kbd{d}
 (@code{image-dired-flag-thumb-original-file}) to flag the image file
-for deletion in the Dired buffer.  You can also delete the thumbnail
-image from the thumbnail buffer with @kbd{C-d}
-(@code{image-dired-delete-char}).
+for deletion in the Dired buffer.  Alternatively, you can remove an
+image's thumbnail from the thumbnail buffer without flagging the image
+for deletion, by typing @kbd{C-d} (@code{image-dired-delete-char}).
+
+@findex image-dired-dired-toggle-marked-thumbs
+@findex image-dired-dired-display-external
+@findex image-dired-dired-display-image
+  You could also use Image-Dired for ``inline'' operations (i.e.,
+right into the Dired buffer).  Type @kbd{C-t C-t}, and the thumbnails
+of the selected images in Dired will appear in front of their names
+(@code{image-dired-dired-toggle-marked-thumbs}).  @kbd{C-t i} and
+@kbd{C-t x} will display the image under the point in Emacs or with
+the external viewer, respectively.
 
   More advanced features include @dfn{image tags}, which are metadata
 used to categorize image files.  The tags are stored in a plain text
@@ -1684,14 +1694,18 @@ in the minibuffer.  To mark files having a certain tag, 
type @kbd{C-t f}
 (@code{image-dired-mark-tagged-files}).  After marking image files
 with a certain tag, you can use @kbd{C-t d} to view them.
 
+@findex image-dired-dired-comment-files
+@findex image-dired-dired-edit-comment-and-tags
   You can also tag a file directly from the thumbnail buffer by typing
-@kbd{t t} and you can remove a tag by typing @kbd{t r}.  There is also
-a special tag called ``comment'' for each file (it is not a tag in
-the exact same sense as the other tags, it is handled slightly
-differently).  That is used to enter a comment or description about the
-image.  You comment a file from the thumbnail buffer by typing
+@kbd{t t}, and you can remove a tag by typing @kbd{t r}.  There is
+also a special tag called ``comment'' for each file (it is not a tag
+in the exact same sense as the other tags, it is handled slightly
+differently).  That is used to enter a comment or description about
+the image.  You comment a file from the thumbnail buffer by typing
 @kbd{c}.  You will be prompted for a comment.  Type @kbd{C-t c} to add
 a comment from Dired (@code{image-dired-dired-comment-files}).
+@kbd{C-t e} will bring a buffer to edit comment and tags
+(@code{image-dired-dired-edit-comment-and-tags}).
 
 @vindex image-dired-thumb-visible-marks
   Files that are marked in Dired will also be marked in Image-Dired if
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index cfcd1851188..11632e7f28e 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -167,28 +167,27 @@ to use the Thumbnail Managing Standard; they will be 
saved in
 There are three ways that Image-Dired can store and generate
 thumbnails:
 
- 1. According to the \"Thumbnail Managing Standard\", which allows
+ 1. According to the Thumbnail Managing Standard, which allows
     sharing of thumbnails across different programs.  Thumbnails
     will be stored in \"$XDG_CACHE_HOME/thumbnails/\"
 
-    To use this way, set this user option to one of the following values:
+    Set this user option to one of the following symbols:
 
     - `standard' means use thumbnails sized 128x128.
     - `standard-large' means use thumbnails sized 256x256.
     - `standard-x-large' means use thumbnails sized 512x512.
     - `standard-xx-large' means use thumbnails sized 1024x1024.
 
- 2. In the Image-Dired specific directory indicated by
+ 2. In the Image-Dired specific directory, as indicated by
     `image-dired-dir'.
 
-    To use this way, set this user option to `image-dired' (or
-    to `use-image-dired-dir', which means the same thing for
-    backward-compatibility reasons).
+    Set this user option to `image-dired' (`use-image-dired-dir'
+    also works, for backward-compatibility reasons).
 
  3. In a subdirectory \".image-dired\" in the same directory
-    where the image files are.
+    as the image files.
 
-    To use this way, set this user option to `per-directory'.
+    Set this user option to `per-directory'.
 
 To control the default size of thumbnails for alternatives (2)
 and (3) above, customize the value of `image-dired-thumb-size'.
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 267a7a5ea23..a9f236f674f 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2782,10 +2782,9 @@ for which LSP on-type-formatting should be requested."
               (cl-sort completions
                        #'string-lessp
                        :key (lambda (c)
-                              (or (plist-get
-                                   (get-text-property 0 'eglot--lsp-item c)
-                                   :sortText)
-                                  "")))))
+                              (plist-get
+                               (get-text-property 0 'eglot--lsp-item c)
+                               :sortText)))))
            (metadata `(metadata (category . eglot)
                                 (display-sort-function . ,sort-completions)))
            resp items (cached-proxies :none)