diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | ecb21060d5c1752d41d7a742be565c59b5fcb855 (patch) | |
| tree | fadebcd18a69457a1d564f738c3f9bdcf512ab4b /lisp/tutorial.el | |
| parent | 42af7493ae7e7a14ee508800c7fa75b65a94c143 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.gz emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.bz2 emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index 841facff69c..26fb0e503f7 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -210,14 +210,12 @@ LEFT and RIGHT are the elements to compare." (defconst tutorial--default-keys ;; On window system, `suspend-emacs' is replaced in the default ;; keymap - (let* ((suspend-emacs (if window-system - 'iconify-or-deiconify-frame - 'suspend-emacs)) + (let* ((suspend-emacs 'suspend-frame) (default-keys `((ESC-prefix [27]) (Control-X-prefix [?\C-x]) (mode-specific-command-prefix [?\C-c]) - (save-buffers-kill-emacs [?\C-x ?\C-c]) + (save-buffers-kill-terminal [?\C-x ?\C-c]) ;; * SUMMARY (scroll-up [?\C-v]) @@ -293,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 [?\M-q]) + (fill-paragraph-or-region [?\M-q]) ;; * SEARCHING (isearch-forward [?\C-s]) |