diff options
| author | Miles Bader | 2005-05-20 04:22:05 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-05-20 04:22:05 +0000 |
| commit | 64e9342958694825be1664890dcd22fffcd50d3a (patch) | |
| tree | a43e1796f5a49ae7eeec671447d10ac3731a1834 /src/alloc.c | |
| parent | 5447510256e5a1b371407b751ddcc461044da5df (diff) | |
| parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
| download | emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz emacs-64e9342958694825be1664890dcd22fffcd50d3a.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index 1aa07b01da2..1eeea72ea7e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -534,6 +534,12 @@ memory_full () | |||
| 534 | Fsignal (Qnil, Vmemory_signal_data); | 534 | Fsignal (Qnil, Vmemory_signal_data); |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0, | ||
| 538 | doc: /* t if memory is nearly full, nil otherwise. */) | ||
| 539 | () | ||
| 540 | { | ||
| 541 | return (spare_memory ? Qnil : Qt); | ||
| 542 | } | ||
| 537 | 543 | ||
| 538 | /* Called if we can't allocate relocatable space for a buffer. */ | 544 | /* Called if we can't allocate relocatable space for a buffer. */ |
| 539 | 545 | ||
| @@ -6035,6 +6041,7 @@ The time is in seconds as a floating point value. */); | |||
| 6035 | DEFVAR_INT ("gcs-done", &gcs_done, | 6041 | DEFVAR_INT ("gcs-done", &gcs_done, |
| 6036 | doc: /* Accumulated number of garbage collections done. */); | 6042 | doc: /* Accumulated number of garbage collections done. */); |
| 6037 | 6043 | ||
| 6044 | defsubr (&Smemory_full_p); | ||
| 6038 | defsubr (&Scons); | 6045 | defsubr (&Scons); |
| 6039 | defsubr (&Slist); | 6046 | defsubr (&Slist); |
| 6040 | defsubr (&Svector); | 6047 | defsubr (&Svector); |