diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-19 00:00:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-19 00:00:21 +0000 |
| commit | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (patch) | |
| tree | 09b0646addff3c39f9e96ba89c04bdcc038a87a7 /lisp/tutorial.el | |
| parent | dfc3268dfa133a2e0a677f1af7c1ee548eae065d (diff) | |
| parent | bd3164743080f3eb5fc316aca7cc5322ca58fe33 (diff) | |
| download | emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index 26fb0e503f7..336593891ab 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -291,7 +291,7 @@ LEFT and RIGHT are the elements to compare." ;; * MODE LINE (describe-mode [?\C-h ?m]) (set-fill-column [?\C-x ?f]) - (fill-paragraph-or-region [?\M-q]) + (fill-paragraph [?\M-q]) ;; * SEARCHING (isearch-forward [?\C-s]) @@ -665,7 +665,8 @@ position where the display of changed bindings was inserted." ;; This runs in a hook so protect it: (condition-case err (if (y-or-n-p "Save your position in the tutorial? ") - (tutorial--save-tutorial-to (tutorial--saved-file))) + (tutorial--save-tutorial-to (tutorial--saved-file)) + (message "Tutorial position not saved")) (error (message "Error saving tutorial state: %s" (error-message-string err))))) |