diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/vm-limit.c | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/vm-limit.c')
| -rw-r--r-- | src/vm-limit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm-limit.c b/src/vm-limit.c index 846946b41c1..94725044048 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Functions for memory limit warnings. | 1 | /* Functions for memory limit warnings. |
| 2 | Copyright (C) 1990, 1992, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1990, 1992, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -237,7 +237,7 @@ check_memory_limits (void) | |||
| 237 | (*warn_function) ("Warning: memory in use exceeds lisp pointer size"); | 237 | (*warn_function) ("Warning: memory in use exceeds lisp pointer size"); |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | #if !defined(CANNOT_DUMP) || !defined(SYSTEM_MALLOC) | 240 | #if !defined (CANNOT_DUMP) || !defined (SYSTEM_MALLOC) |
| 241 | /* Some systems that cannot dump also cannot implement these. */ | 241 | /* Some systems that cannot dump also cannot implement these. */ |
| 242 | 242 | ||
| 243 | /* | 243 | /* |