diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-07-29 16:41:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-07-29 16:41:50 +0300 |
| commit | f0f377774b3db7a8c0c3b1e28651876179fdfe2b (patch) | |
| tree | 6b31b9b9dffbfbce7f3dab9158c3c68926c2137e | |
| parent | 64ae6e0100fab05b0ceb9bded6d834208eeb3e8f (diff) | |
| download | emacs-f0f377774b3db7a8c0c3b1e28651876179fdfe2b.tar.gz | |
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)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/tutorial.el | 6 |
2 files changed, 10 insertions, 1 deletions
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)))) |