(tutorial--default-keys): Replace fill-paragraph

with fill-paragraph-or-region.  Suspend command is now the same
`suspend-frame' on window systems and on tty.

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 87d5b53049d3d016d3ef68418978fe68a059a4b0..26fb0e503f787b17670d8a9617049343f91988ad 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -210,9 +210,7 @@ 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
-                            'suspend-frame
-                          'suspend-emacs))
+  (let* ((suspend-emacs 'suspend-frame)
          (default-keys
            `((ESC-prefix [27])
              (Control-X-prefix [?\C-x])
@@ -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])