diff src/window.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 a307f9a2021d
children e38acbeb1cae
line wrap: on
line diff
--- a/src/window.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/window.c	Wed Mar 13 08:54:06 2002 +0000
@@ -3649,7 +3649,7 @@
 
 		  Fselect_window (window, Qnil);
 		  run_hook (Qtemp_buffer_show_hook);
-		  unbind_to (count, Qnil);
+		  unbind_to (count);
 		}
 	    }
 	}
@@ -5798,7 +5798,7 @@
 
   /* Now restore things, when everything else if OK. */
 
-  unbind_to (specpdl_count, Qnil);
+  unbind_to (specpdl_count);
 
   UNGCPRO;
 
@@ -6009,13 +6009,11 @@
        (args))
 {
   /* This function can GC */
-  Lisp_Object val;
   int speccount = specpdl_depth ();
 
   record_unwind_protect (save_window_excursion_unwind,
 			 Fcurrent_window_configuration (Qnil));
-  val = Fprogn (args);
-  return unbind_to (speccount, val);
+  return unbind_to_1 (speccount, Fprogn (args));
 }
 
 DEFUN ("current-pixel-column", Fcurrent_pixel_column, 0, 2, 0, /*