diff options
| author | Kenichi Handa | 2012-08-22 18:05:50 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-22 18:05:50 +0900 |
| commit | fabc1281e9cde34ff9a19d843316d2ceca8647ad (patch) | |
| tree | f38f13cab3ec6c32ab8ab49ea2e60f64969a0d22 /src/keymap.c | |
| parent | 4ff819d728960bf5e52b72501c606f4bb3fde028 (diff) | |
| parent | 842e3a93aa3a0826cb4148376e54cd1527d10901 (diff) | |
| download | emacs-fabc1281e9cde34ff9a19d843316d2ceca8647ad.tar.gz emacs-fabc1281e9cde34ff9a19d843316d2ceca8647ad.zip | |
merge trunk
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index c550b37c1d6..21f7dcb5d37 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1854,7 +1854,7 @@ If KEYMAP is nil, that means no local keymap. */) | |||
| 1854 | if (!NILP (keymap)) | 1854 | if (!NILP (keymap)) |
| 1855 | keymap = get_keymap (keymap, 1, 1); | 1855 | keymap = get_keymap (keymap, 1, 1); |
| 1856 | 1856 | ||
| 1857 | BSET (current_buffer, keymap, keymap); | 1857 | bset_keymap (current_buffer, keymap); |
| 1858 | 1858 | ||
| 1859 | return Qnil; | 1859 | return Qnil; |
| 1860 | } | 1860 | } |