Mercurial > hg > xemacs-beta
diff src/cmdloop.c @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
| author | ben |
|---|---|
| date | Wed, 13 Mar 2002 08:54:06 +0000 |
| parents | b1f74adcc1ff |
| children | a5954632b187 |
line wrap: on
line diff
--- a/src/cmdloop.c Fri Mar 08 13:33:14 2002 +0000 +++ b/src/cmdloop.c Wed Mar 13 08:54:06 2002 +0000 @@ -1,6 +1,6 @@ /* Editor command loop. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - Copyright (C) 1995, 1996 Ben Wing. + Copyright (C) 1995, 1996, 2001 Ben Wing. This file is part of XEmacs. @@ -97,7 +97,7 @@ Fdisplay_error (data, Qt); check_quit (); /* make Vquit_flag accurate */ Vquit_flag = Qnil; - return (unbind_to (speccount, Qt)); + return (unbind_to_1 (speccount, Qt)); } DEFUN ("really-early-error-handler", Freally_early_error_handler, 1, 1, 0, /* @@ -124,7 +124,7 @@ Fbacktrace (Qexternal_debugging_output, Qt); stderr_out ("*** Killing XEmacs\n"); #ifdef HAVE_MS_WINDOWS - Fmswindows_message_box (build_string ("Initialization error"), + Fmswindows_message_box (build_msg_string ("Initialization error"), Qnil, Qnil); #endif return Fkill_emacs (make_int (-1)); @@ -373,7 +373,7 @@ /* Turn abort-recursive-edit into a quit. */ Fsignal (Qquit, Qnil); - return unbind_to (speccount, Qnil); + return unbind_to (speccount); } #endif /* !LISP_COMMAND_LOOP */ @@ -566,11 +566,10 @@ { /* Bind dont_check_for_quit to 1 so that C-g gets read in rather than quitting back to the minibuffer. */ - int count = specpdl_depth (); - begin_dont_check_for_quit (); + int count = begin_dont_check_for_quit (); Fsit_for (make_int (2), Qnil); clear_echo_area (selected_frame (), Qnil, 0); - unbind_to (count, Qnil); + unbind_to (count); } Fnext_event (event, Qnil);