[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110263: * lisp/tutorial.el (help-wit
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110263: * lisp/tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook. |
Date: |
Sat, 29 Sep 2012 23:21:50 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110263
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 23:21:50 -0400
message:
* lisp/tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.
modified:
lisp/ChangeLog
lisp/tutorial.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-09-30 03:20:00 +0000
+++ b/lisp/ChangeLog 2012-09-30 03:21:50 +0000
@@ -1,5 +1,7 @@
2012-09-30 Stefan Monnier <address@hidden>
+ * tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.
+
* textmodes/text-mode.el (paragraph-indent-minor-mode): Make it
a proper minor-mode.
=== modified file 'lisp/tutorial.el'
--- a/lisp/tutorial.el 2012-08-11 02:12:12 +0000
+++ b/lisp/tutorial.el 2012-09-30 03:21:50 +0000
@@ -765,14 +765,13 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110263: * lisp/tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.,
Stefan Monnier <=