From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 29 Jul 2014 13:41:50 +0000 (+0300)
Subject: Fix bug #18146 with bogus key rebindings in TUTORIAL.he.
X-Git-Tag: emacs-24.3.93~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0f377774b3db7a8c0c3b1e28651876179fdfe2b;p=emacs.git

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 f68ee42680d..3e5042a0f91 100644
--- 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 8925a02a9e7..f6d4cb053ec 100644
--- 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))))