* lisp/isearch.el (isearch--current-buffer): New var

[gnu-emacs] / lisp / tutorial.el

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index f6d4cb053ec1cca3a1468652e70e3c553fa5a201..3b007610c9e8af5b1bb1ced1967136f00b220065 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -1,6 +1,6 @@
 ;;; tutorial.el --- tutorial for Emacs
 
-;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
@@ -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))))