From: Joakim Verona Date: Thu, 27 Aug 2015 20:57:30 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b21639d7ff307e9e0a815dc6d0a7c7140b1f048;p=emacs.git Merge remote-tracking branch 'origin/master' into xwidget_mvp --- 9b21639d7ff307e9e0a815dc6d0a7c7140b1f048 diff --cc src/buffer.c index cdf6c7241b6,fc2ee82e447..88a47a62b01 --- a/src/buffer.c +++ b/src/buffer.c @@@ -1754,15 -1744,8 +1747,13 @@@ cleaning up all windows currently displ /* Unlock this buffer's file, if it is locked. */ unlock_buffer (b); - GCPRO1 (buffer); kill_buffer_processes (buffer); - UNGCPRO; +#ifdef HAVE_XWIDGETS + GCPRO1 (buffer); + kill_buffer_xwidgets (buffer); + UNGCPRO; +#endif /* Killing buffer processes may run sentinels which may have killed our buffer. */ if (!BUFFER_LIVE_P (b))