1 files changed, 9 insertions, 1 deletions

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b6c9ecd456f..996f6a48aaa 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -45,7 +45,15 @@ If there's no tutorial in that language, `TUTORIAL' is selected.
 With arg, you are asked to choose which language."
   (interactive "P")
   (let ((lang (if arg
-                  (read-language-name 'tutorial "Language: " "English")
+                  (progn
+                    ;; Display a completion list right away
+                    ;; to guide the user.
+                    (with-output-to-temp-buffer "*Completions*"
+                      (display-completion-list
+                       (all-completions "" language-info-alist
+                                        (lambda (elm)
+                                          (and (listp elm) (assq 'tutorial elm))))))
+                    (read-language-name 'tutorial "Language: " "English"))
                 (if (get-language-info current-language-environment 'tutorial)
                     current-language-environment
                   "English")))