diff options
| author | Kenichi Handa | 2013-03-16 01:04:47 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-03-16 01:04:47 +0900 |
| commit | 646859d33a8ede0cbb3e1685a313420b6510c9c1 (patch) | |
| tree | c8077a7e046ac64dd9bd680b5349bfc34cd6deac /src/alloc.c | |
| parent | 8a44e6d176989d8eef140314098c76a70248ba61 (diff) | |
| parent | d7251c31ab74219747e3755f78ee07b37a16697d (diff) | |
| download | emacs-646859d33a8ede0cbb3e1685a313420b6510c9c1.tar.gz emacs-646859d33a8ede0cbb3e1685a313420b6510c9c1.zip | |
merge trunk
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 80086433e65..b2703c5f961 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -422,11 +422,11 @@ buffer_memory_full (ptrdiff_t nbytes) | |||
| 422 | 422 | ||
| 423 | #ifndef REL_ALLOC | 423 | #ifndef REL_ALLOC |
| 424 | memory_full (nbytes); | 424 | memory_full (nbytes); |
| 425 | #endif | 425 | #else |
| 426 | |||
| 427 | /* This used to call error, but if we've run out of memory, we could | 426 | /* This used to call error, but if we've run out of memory, we could |
| 428 | get infinite recursion trying to build the string. */ | 427 | get infinite recursion trying to build the string. */ |
| 429 | xsignal (Qnil, Vmemory_signal_data); | 428 | xsignal (Qnil, Vmemory_signal_data); |
| 429 | #endif | ||
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | /* A common multiple of the positive integers A and B. Ideally this | 432 | /* A common multiple of the positive integers A and B. Ideally this |