comparison src/buffer.c @ 90813:e6fdae9180d4

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 698-710) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 216) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
author Miles Bader <miles@gnu.org>
date Tue, 24 Apr 2007 21:56:25 +0000
parents 4ef881a120fe 421b3f5480da
children e9f94688a064
comparison
equal deleted inserted replaced
90812:6137cc8ddf90 90813:e6fdae9180d4
1457 #ifdef CLASH_DETECTION 1457 #ifdef CLASH_DETECTION
1458 /* Unlock this buffer's file, if it is locked. */ 1458 /* Unlock this buffer's file, if it is locked. */
1459 unlock_buffer (b); 1459 unlock_buffer (b);
1460 #endif /* CLASH_DETECTION */ 1460 #endif /* CLASH_DETECTION */
1461 1461
1462 GCPRO1 (buf);
1462 kill_buffer_processes (buf); 1463 kill_buffer_processes (buf);
1464 UNGCPRO;
1465
1466 /* Killing buffer processes may run sentinels which may
1467 have called kill-buffer. */
1468
1469 if (NILP (b->name))
1470 return Qnil;
1471
1463 clear_charpos_cache (b); 1472 clear_charpos_cache (b);
1464 1473
1465 tem = Vinhibit_quit; 1474 tem = Vinhibit_quit;
1466 Vinhibit_quit = Qt; 1475 Vinhibit_quit = Qt;
1467 replace_buffer_in_all_windows (buf); 1476 replace_buffer_in_all_windows (buf);