comparison src/emacs.c @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
author Miles Bader <miles@gnu.org>
date Wed, 20 Sep 2006 06:04:23 +0000
parents a1a25ac6c88a 367ffce32084
children 02cf29720f31
comparison
equal deleted inserted replaced
90601:a1a25ac6c88a 90602:b5c13d1564a9
2154 reset_sys_modes (); 2154 reset_sys_modes ();
2155 #endif 2155 #endif
2156 2156
2157 stuff_buffered_input (stuff); 2157 stuff_buffered_input (stuff);
2158 2158
2159 #ifdef subprocesses
2159 inhibit_sentinels = 1; 2160 inhibit_sentinels = 1;
2161 #endif
2160 kill_buffer_processes (Qnil); 2162 kill_buffer_processes (Qnil);
2161 Fdo_auto_save (Qt, Qnil); 2163 Fdo_auto_save (Qt, Qnil);
2162 2164
2163 #ifdef CLASH_DETECTION 2165 #ifdef CLASH_DETECTION
2164 unlock_all_files (); 2166 unlock_all_files ();