Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/buffer.c Tue Apr 24 11:35:23 2007 +0000 +++ b/src/buffer.c Tue Apr 24 21:56:25 2007 +0000 @@ -1459,7 +1459,16 @@ unlock_buffer (b); #endif /* CLASH_DETECTION */ + GCPRO1 (buf); kill_buffer_processes (buf); + UNGCPRO; + + /* Killing buffer processes may run sentinels which may + have called kill-buffer. */ + + if (NILP (b->name)) + return Qnil; + clear_charpos_cache (b); tem = Vinhibit_quit;
