aboutsummaryrefslogtreecommitdiffstats
path: root/test/src
diff options
context:
space:
mode:
authorJohn Wiegley2016-01-02 23:31:52 -0800
committerJohn Wiegley2016-01-02 23:31:52 -0800
commit91917dd58ec5278e555b9c693a830749083e8f89 (patch)
tree3b0c8104106f6dec7873378bccc1273e587f6051 /test/src
parentc988877f436bbbb285a0b34f5e037f7758dd6349 (diff)
parent9f2f14a0725211b13a744573344636b57b9c98b9 (diff)
downloademacs-91917dd58ec5278e555b9c693a830749083e8f89.tar.gz
emacs-91917dd58ec5278e555b9c693a830749083e8f89.zip
Merge branch 'emacs-25-merge'
Diffstat (limited to 'test/src')
-rw-r--r--test/src/keymap-tests.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index 973b2407391..524563fea50 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -23,7 +23,7 @@
23 23
24(require 'ert) 24(require 'ert)
25 25
26(ert-deftest keymap-store_in_keymap-FASTINT-on-nonchars () 26(ert-deftest keymap-store_in_keymap-XFASTINT-on-non-characters ()
27 "Check for bug fixed in \"Fix assertion violation in define-key\", 27 "Check for bug fixed in \"Fix assertion violation in define-key\",
28commit 86c19714b097aa477d339ed99ffb5136c755a046." 28commit 86c19714b097aa477d339ed99ffb5136c755a046."
29 (let ((def (lookup-key Buffer-menu-mode-map [32]))) 29 (let ((def (lookup-key Buffer-menu-mode-map [32])))