* lisp/tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d4312b03be9aeafb18f66dc94671377fdce1839..a0697cdc546b2cd3bfae8d1c2c53e402d850d461 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.
+
        * textmodes/text-mode.el (paragraph-indent-minor-mode): Make it
        a proper minor-mode.
 

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 64879e5cfd5289c65233d20ebcdd3132cdbd21a6..6f76068ea9d42a9dfea3d9b283bafdfd756911b8 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -765,14 +765,13 @@ Run the Viper tutorial? "))
                       (funcall 'viper-tutorial 0))
              (message "Tutorial aborted by user"))
          (message prompt1)))
-    (let* ((lang (if arg
-                     (let ((minibuffer-setup-hook minibuffer-setup-hook))
-                       (add-hook 'minibuffer-setup-hook
-                                 'minibuffer-completion-help)
-                       (read-language-name 'tutorial "Language: " "English"))
-                   (if (get-language-info current-language-environment 'tutorial)
-                       current-language-environment
-                     "English")))
+    (let* ((lang (cond
+                  (arg
+                   (minibuffer-with-setup-hook #'minibuffer-completion-help
+                     (read-language-name 'tutorial "Language: " "English")))
+                  ((get-language-info current-language-environment 'tutorial)
+                   current-language-environment)
+                  (t "English")))
            (filename (get-language-info lang 'tutorial))
            (tut-buf-name filename)
            (old-tut-buf (get-buffer tut-buf-name))