aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorKenichi Handa2012-08-28 22:44:20 +0900
committerKenichi Handa2012-08-28 22:44:20 +0900
commit4eb4de01df384be9b8d811f7ab476eeb37ece748 (patch)
treed04f0dae31dd8b533a0c3cd738430841ce7ebb84 /src/keymap.c
parentfabc1281e9cde34ff9a19d843316d2ceca8647ad (diff)
parent4f2daf31078e2cc059710e129dffe0beed8fc7c2 (diff)
downloademacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.tar.gz
emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.zip
merge trunk
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 21f7dcb5d37..4031091501c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1570,9 +1570,7 @@ like in the respective argument of `key-binding'. */)
1570 would not be a problem here, but it is easier to keep 1570 would not be a problem here, but it is easier to keep
1571 things the same. 1571 things the same.
1572 */ 1572 */
1573 1573 record_unwind_current_buffer ();
1574 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
1575
1576 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); 1574 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
1577 } 1575 }
1578 } 1576 }