Mercurial > emacs

diff src/callint.c @ 83716:a73440d2f146 merge-multi-tty-to-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge multi-tty branch Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:28:10 +0000
parents 65663fcd2caa
children 74dfb3b7d8f2
line wrap: on
line diff
--- a/src/callint.c	Wed Aug 29 01:14:48 2007 +0000
+++ b/src/callint.c	Wed Aug 29 05:28:10 2007 +0000
@@ -402,8 +402,8 @@
       real_this_command= save_real_this_command;
       current_kboard->Vlast_command = save_last_command;
 
-      single_kboard_state ();
-      return apply1 (function, specs);
+      temporarily_switch_to_single_kboard (NULL);
+      return unbind_to (speccount, apply1 (function, specs));
     }
 
   /* Here if function specifies a string to control parsing the defaults */
@@ -854,12 +854,11 @@
   real_this_command= save_real_this_command;
   current_kboard->Vlast_command = save_last_command;
 
-  single_kboard_state ();
-
   {
     Lisp_Object val;
     specbind (Qcommand_debug_status, Qnil);
 
+    temporarily_switch_to_single_kboard (NULL);
     val = Ffuncall (count + 1, args);
     UNGCPRO;
     return unbind_to (speccount, val);