diff options
| author | Andrea Corallo | 2020-12-23 19:49:58 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-12-23 19:49:58 +0100 |
| commit | b99a4744822a11e4af098b63db18f54a4e323d58 (patch) | |
| tree | a3836dfbd6bf4ebfc5b61c566d146cfd65984f62 /src/alloc.c | |
| parent | ffcd490cb49ba86d625288ea425d98e8cac22a05 (diff) | |
| parent | 40bc77d9a6b8d824690fb6ee3003d74951bb3ae5 (diff) | |
| download | emacs-b99a4744822a11e4af098b63db18f54a4e323d58.tar.gz emacs-b99a4744822a11e4af098b63db18f54a4e323d58.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
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 22f37b0cedd..25153621298 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -664,7 +664,7 @@ display_malloc_warning (void) | |||
| 664 | call3 (intern ("display-warning"), | 664 | call3 (intern ("display-warning"), |
| 665 | intern ("alloc"), | 665 | intern ("alloc"), |
| 666 | build_string (pending_malloc_warning), | 666 | build_string (pending_malloc_warning), |
| 667 | intern ("emergency")); | 667 | intern (":emergency")); |
| 668 | pending_malloc_warning = 0; | 668 | pending_malloc_warning = 0; |
| 669 | } | 669 | } |
| 670 | 670 | ||