master 5f87550f53: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 5f87550f533ba051fc366627a39aacab3c5629db
Merge: 8f11fb114c 80736aef90
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    80736aef90 Fix which-func-update doc string
    d9e5ae5e20 Improve wording of 'dired-jump's description
---
 doc/emacs/dired.texi         | 16 +++++++++++-----
 lisp/progmodes/which-func.el |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 700b3f2191..3112ac332b 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -113,11 +113,17 @@ a directory's name.
 @findex dired-jump-other-window
 @kindex C-x C-j
 @kindex C-x 4 C-j
-  Typing @kbd{C-x C-j} (@code{dired-jump}) in any buffer will open a
-Dired buffer and move point to the line corresponding to the current
-file.  In Dired, move up a level and go to the previous directory's
-line.  Typing @kbd{C-x 4 C-j} (@code{dired-jump-other-window} has the
-same effect but opens a new window for the Dired buffer.
+  You can ask Emacs to invoke Dired on the default-directory
+(@pxref{File Names, default-directory}) of any buffer, by typing
+@kbd{C-x C-j} (@code{dired-jump}).  If the buffer visits a file, this
+command will move point to that file's line in the Dired buffer it
+shows; otherwise, point will end up on the first file in the directory
+listing.  As an exception, if you type @kbd{C-x C-j} in a Dired
+buffer, Emacs displays the directory listing of the parent directory
+and places point on the line that corresponds to the directory where
+you invoked @code{dired-jump}.  Typing @kbd{C-x 4 C-j}
+(@code{dired-jump-other-window} has the same effect, but displays the
+Dired buffer in a new window.
 
   The variable @code{dired-listing-switches} specifies the options to
 give to @command{ls} for listing the directory; this string
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4388b0e7de..abe25f2c63 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -216,7 +216,7 @@ It creates the Imenu index for the buffer, if necessary."
      (setq which-func-mode nil))))
 
 (defun which-func-update ()
-  "Update the Which-Function mode display for all windows."
+  "Update the Which-Function mode display in the current window."
   ;; (walk-windows 'which-func-update-1 nil 'visible))
   (let ((non-essential t))
     (which-func-update-1 (selected-window))))