Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index f6d4cb053ec..fcb840fcfed 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -209,10 +209,10 @@ LEFT and RIGHT are the elements to compare."
                  (symbol-name cx)))))))
 
 (defconst tutorial--default-keys
-  ;; On window system, `suspend-emacs' is replaced in the default
-  ;; keymap
+  ;; On window system, `suspend-emacs' is replaced in the default keymap.
   (let* ((suspend-emacs 'suspend-frame)
          (default-keys
+           ;; The first few are not mentioned but are basic:
            `((ESC-prefix [27])
              (Control-X-prefix [?\C-x])
              (mode-specific-command-prefix [?\C-c])
@@ -552,7 +552,7 @@ with some explanatory links."
           ;; binding because the Hebrew tutorial uses directional
           ;; controls and Hebrew character maqaf, the Hebrew hyphen,
           ;; immediately before the binding string.
-          (concat "\\([[:space:]]\\|[[:punct:]]\\)\\("
+          (concat "\\(?:[[:space:]]\\|[[:punct:]]\\)\\("
                   (mapconcat (lambda (kdf) (regexp-quote
                                             (tutorial--key-description
                                              (nth 1 kdf))))