Fix bug #18146 with bogus key rebindings in TUTORIAL.he.

 lisp/tutorial.el (tutorial--display-changes): Accept punctuation
 characters before the key binding.  (Bug#18146)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f68ee42680da9d92cadf0ec20407af003b5d82a4..3e5042a0f91c37352a30660863a765ffcd7de830 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * tutorial.el (tutorial--display-changes): Accept punctuation
+       characters before the key binding.  (Bug#18146)
+
 2014-07-28  Stephen Berman  <stephen.berman@gmx.net>
 
        * doc-view.el (doc-view-open-text): Don't require that the

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 8925a02a9e7532a09730aaa617297fc59d383175..f6d4cb053ec1cca3a1468652e70e3c553fa5a201 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -548,7 +548,11 @@ with some explanatory links."
         (start (point))
         (case-fold-search nil)
         (keybindings-regexp
-         (concat "[[:space:]]\\("
+         ;; Accept either [:space:] or [:punct:] before the key
+         ;; binding because the Hebrew tutorial uses directional
+         ;; controls and Hebrew character maqaf, the Hebrew hyphen,
+         ;; immediately before the binding string.
+         (concat "\\([[:space:]]\\|[[:punct:]]\\)\\("
                  (mapconcat (lambda (kdf) (regexp-quote
                                            (tutorial--key-description
                                             (nth 1 kdf))))