diff options
| author | John Wiegley | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /test/src | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz emacs-9f2f14a0725211b13a744573344636b57b9c98b9.zip | |
Merge emacs-25 into master (using imerge)
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/keymap-tests.el | 2 |
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\", |
| 28 | commit 86c19714b097aa477d339ed99ffb5136c755a046." | 28 | commit 86c19714b097aa477d339ed99ffb5136c755a046." |
| 29 | (let ((def (lookup-key Buffer-menu-mode-map [32]))) | 29 | (let ((def (lookup-key Buffer-menu-mode-map [32]))) |