diff options
| author | Miles Bader | 2005-04-09 02:16:29 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-04-09 02:16:29 +0000 |
| commit | 768d4533ce51d61ce065b28f63aae43c7be0d1cc (patch) | |
| tree | fb2d103d5c9354b3a15550b160bba0ff2e22c418 /src/alloc.c | |
| parent | 918bcc18650840562677f841aa0bcaa34a069be5 (diff) | |
| parent | 2a9e192d3815d2c34fdd41d52590027805bc9055 (diff) | |
| download | emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.gz emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index aee09c3f16c..1aa07b01da2 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -4644,6 +4644,8 @@ returns nil, because real GC can't be done. */) | |||
| 4644 | if (pure_bytes_used_before_overflow) | 4644 | if (pure_bytes_used_before_overflow) |
| 4645 | return Qnil; | 4645 | return Qnil; |
| 4646 | 4646 | ||
| 4647 | CHECK_CONS_LIST (); | ||
| 4648 | |||
| 4647 | /* Don't keep undo information around forever. | 4649 | /* Don't keep undo information around forever. |
| 4648 | Do this early on, so it is no problem if the user quits. */ | 4650 | Do this early on, so it is no problem if the user quits. */ |
| 4649 | { | 4651 | { |
| @@ -4837,6 +4839,8 @@ returns nil, because real GC can't be done. */) | |||
| 4837 | 4839 | ||
| 4838 | UNBLOCK_INPUT; | 4840 | UNBLOCK_INPUT; |
| 4839 | 4841 | ||
| 4842 | CHECK_CONS_LIST (); | ||
| 4843 | |||
| 4840 | /* clear_marks (); */ | 4844 | /* clear_marks (); */ |
| 4841 | gc_in_progress = 0; | 4845 | gc_in_progress = 0; |
| 4842 | 4846 | ||