summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-09-01 09:44:06 -0700
committerGlenn Morris <rgm@gnu.org>2014-09-01 09:44:06 -0700
commitad5c82a8cc3f78172dc872c7fe3c6e774f50fe15 (patch)
tree50a96053c8129aca37d2280c0feb3c3b7d079552
parent267a63b06d5ba2b8315f5b900084c3d6c981ea35 (diff)
downloademacs-ad5c82a8cc3f78172dc872c7fe3c6e774f50fe15.tar.gz
* lisp/tutorial.el (tutorial--display-changes): Fix 2014-07-29 change.
Fixes: debbugs:18382
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/tutorial.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bccfcb8dc1c..939553608ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-01 Glenn Morris <rgm@gnu.org>
+
+ * tutorial.el (tutorial--display-changes):
+ Fix 2014-07-29 change. (Bug#18382)
+
2014-08-29 Ken Brown <kbrown@cornell.edu>
* startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index f6d4cb053ec..2f264dc82bd 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -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))))