diff options
| author | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
| commit | 36a305a723c63fd345be65c536c52fe9765c14be (patch) | |
| tree | fb89d9e103552863214c60297a65320917109357 /lisp/tutorial.el | |
| parent | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff) | |
| parent | 795b1482a9e314cda32d62ac2988f573d359366e (diff) | |
| download | emacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz emacs-36a305a723c63fd345be65c536c52fe9765c14be.zip | |
Merge from trunk
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index 64879e5cfd5..6f76068ea9d 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el | |||
| @@ -765,14 +765,13 @@ Run the Viper tutorial? ")) | |||
| 765 | (funcall 'viper-tutorial 0)) | 765 | (funcall 'viper-tutorial 0)) |
| 766 | (message "Tutorial aborted by user")) | 766 | (message "Tutorial aborted by user")) |
| 767 | (message prompt1))) | 767 | (message prompt1))) |
| 768 | (let* ((lang (if arg | 768 | (let* ((lang (cond |
| 769 | (let ((minibuffer-setup-hook minibuffer-setup-hook)) | 769 | (arg |
| 770 | (add-hook 'minibuffer-setup-hook | 770 | (minibuffer-with-setup-hook #'minibuffer-completion-help |
| 771 | 'minibuffer-completion-help) | 771 | (read-language-name 'tutorial "Language: " "English"))) |
| 772 | (read-language-name 'tutorial "Language: " "English")) | 772 | ((get-language-info current-language-environment 'tutorial) |
| 773 | (if (get-language-info current-language-environment 'tutorial) | 773 | current-language-environment) |
| 774 | current-language-environment | 774 | (t "English"))) |
| 775 | "English"))) | ||
| 776 | (filename (get-language-info lang 'tutorial)) | 775 | (filename (get-language-info lang 'tutorial)) |
| 777 | (tut-buf-name filename) | 776 | (tut-buf-name filename) |
| 778 | (old-tut-buf (get-buffer tut-buf-name)) | 777 | (old-tut-buf (get-buffer tut-buf-name)) |