[Emacs-diffs] emacs-24 r117416: Fix bug #18146 with bogus key rebindings in TUTORIAL.he.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117416
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18146
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-07-29 16:41:50 +0300
message:
  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)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/tutorial.el               
tutorial.el-20091113204419-o5vbwnq5f7feedwu-4434

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-28 09:32:25 +0000
+++ b/lisp/ChangeLog    2014-07-29 13:41:50 +0000
@@ -1,3 +1,8 @@
+2014-07-29  Eli Zaretskii  <address@hidden>
+
+       * tutorial.el (tutorial--display-changes): Accept punctuation
+       characters before the key binding.  (Bug#18146)
+
 2014-07-28  Stephen Berman  <address@hidden>
 
        * doc-view.el (doc-view-open-text): Don't require that the

=== modified file 'lisp/tutorial.el'
--- a/lisp/tutorial.el  2014-02-10 01:34:22 +0000
+++ b/lisp/tutorial.el  2014-07-29 13:41:50 +0000
@@ -548,7 +548,11 @@
         (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))))