diff options
| author | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /src/emacs.c | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz emacs-comment-cache.zip | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index 28b395c4fb4..3083d0df302 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -688,7 +688,7 @@ main (int argc, char **argv) | |||
| 688 | dumping = !initialized && (strcmp (argv[argc - 1], "dump") == 0 | 688 | dumping = !initialized && (strcmp (argv[argc - 1], "dump") == 0 |
| 689 | || strcmp (argv[argc - 1], "bootstrap") == 0 ); | 689 | || strcmp (argv[argc - 1], "bootstrap") == 0 ); |
| 690 | 690 | ||
| 691 | generating_ldefs_boot = getenv ("GENERATE_LDEFS_BOOT"); | 691 | generating_ldefs_boot = !!getenv ("GENERATE_LDEFS_BOOT"); |
| 692 | 692 | ||
| 693 | 693 | ||
| 694 | /* True if address randomization interferes with memory allocation. */ | 694 | /* True if address randomization interferes with memory allocation. */ |