diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-28 21:04:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-28 21:04:38 +0000 |
| commit | 93d7a3669284221c9272784875f69c047873fe04 (patch) | |
| tree | 853af54aa3e46a73bd248dc7033dbf4e39132f9f /src/alloc.c | |
| parent | b4bb3cbc7caca5c9c207d9ed42cacb978790af67 (diff) | |
| parent | 9594f9294b16c3e828b593c4cc9159b6328e1aa3 (diff) | |
| download | emacs-93d7a3669284221c9272784875f69c047873fe04.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-348
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 35ce8a5cfa1..98fa4be6953 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1685,7 +1685,7 @@ static int total_string_size; /* We check for overrun in string data blocks by appending a small "cookie" after each allocated string data block, and check for the - presense of this cookie during GC. */ + presence of this cookie during GC. */ #define GC_STRING_OVERRUN_COOKIE_SIZE 4 static char string_overrun_cookie[GC_STRING_OVERRUN_COOKIE_SIZE] = |