diff options
| author | Paul Eggert | 2015-02-01 11:39:36 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-02-01 11:45:15 -0800 |
| commit | 241260cc2819e5df254ad85953588b06388ade61 (patch) | |
| tree | 3b0099a54471738d76567ff650466a14cd3de954 /src/buffer.c | |
| parent | 1d1162479caf1fdf48564f1486fa84e3cdacaa9b (diff) | |
| download | emacs-241260cc2819e5df254ad85953588b06388ade61.tar.gz emacs-241260cc2819e5df254ad85953588b06388ade61.zip | |
Revert changes installed by xwidgets merge
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/buffer.c b/src/buffer.c index 223683db6f3..67eda3ee89e 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -42,9 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 42 | #include "keymap.h" | 42 | #include "keymap.h" |
| 43 | #include "frame.h" | 43 | #include "frame.h" |
| 44 | 44 | ||
| 45 | #ifdef HAVE_XWIDGETS | ||
| 46 | #include "xwidget.h" | ||
| 47 | #endif /* HAVE_XWIDGETS */ | ||
| 48 | #ifdef WINDOWSNT | 45 | #ifdef WINDOWSNT |
| 49 | #include "w32heap.h" /* for mmap_* */ | 46 | #include "w32heap.h" /* for mmap_* */ |
| 50 | #endif | 47 | #endif |
| @@ -1758,11 +1755,6 @@ cleaning up all windows currently displaying the buffer to be killed. */) | |||
| 1758 | kill_buffer_processes (buffer); | 1755 | kill_buffer_processes (buffer); |
| 1759 | UNGCPRO; | 1756 | UNGCPRO; |
| 1760 | 1757 | ||
| 1761 | #ifdef HAVE_XWIDGETS | ||
| 1762 | GCPRO1 (buffer); | ||
| 1763 | kill_buffer_xwidgets (buffer); | ||
| 1764 | UNGCPRO; | ||
| 1765 | #endif /* HAVE_XWIDGETS */ | ||
| 1766 | /* Killing buffer processes may run sentinels which may have killed | 1758 | /* Killing buffer processes may run sentinels which may have killed |
| 1767 | our buffer. */ | 1759 | our buffer. */ |
| 1768 | if (!BUFFER_LIVE_P (b)) | 1760 | if (!BUFFER_LIVE_P (b)) |