master e41ba8ab89: Fix dired-goto-subdir prompt

[Stefan Kangas]

branch: master
commit e41ba8ab89a125c91dee672845679f2dec19853a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Fix dired-goto-subdir prompt
    
    * lisp/dired-aux.el (dired-goto-subdir): Fix prompt and improve
    docstring.  Add interactive mode tag for dired-mode.
---
 lisp/dired-aux.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index c403cc5cbd..5f2d1cfc9f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -3023,18 +3023,20 @@ When called interactively and not on a subdir line, go 
to this subdir's line."
 
 ;;;###autoload
 (defun dired-goto-subdir (dir)
-  "Go to end of header line of DIR in this dired buffer.
+  "Go to end of header line of inserted directory DIR in this Dired buffer.
+When called interactively, prompt for the inserted subdirectory
+to go to.
+
 Return value of point on success, otherwise return nil.
 The next char is \\n."
   (interactive
    (prog1                              ; let push-mark display its message
        (list (expand-file-name
-             (completing-read "Goto in situ directory: " ; prompt
-                              dired-subdir-alist ; table
-                              nil      ; predicate
-                              t        ; require-match
-                              (dired-current-directory))))
-     (push-mark)))
+              (completing-read "Goto inserted directory: "
+                               dired-subdir-alist nil t
+                               (dired-current-directory))))
+     (push-mark))
+   dired-mode)
   (setq dir (file-name-as-directory dir))
   (let ((elt (assoc dir dired-subdir-alist)))
     (and elt