diff options
| author | Stephen Gildea | 2018-07-31 22:34:35 -0700 |
|---|---|---|
| committer | Stephen Gildea | 2018-07-31 22:34:35 -0700 |
| commit | 1804fece02691798394c9e9bd519cd4a53776018 (patch) | |
| tree | 9d5d441db29404f04417332be3507ba968eec42f /src/alloc.c | |
| parent | 17205d361795eaaa8e09ae62875c7439bb57a078 (diff) | |
| parent | 82d6416a28dc5b4ab65b8081f035679bec4e3604 (diff) | |
| download | emacs-1804fece02691798394c9e9bd519cd4a53776018.tar.gz emacs-1804fece02691798394c9e9bd519cd4a53776018.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
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 8764591336e..ad716f543c3 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6585,7 +6585,7 @@ mark_object (Lisp_Object arg) | |||
| 6585 | CHECK_ALLOCATED_AND_LIVE (live_cons_p); | 6585 | CHECK_ALLOCATED_AND_LIVE (live_cons_p); |
| 6586 | CONS_MARK (ptr); | 6586 | CONS_MARK (ptr); |
| 6587 | /* If the cdr is nil, avoid recursion for the car. */ | 6587 | /* If the cdr is nil, avoid recursion for the car. */ |
| 6588 | if (EQ (ptr->u.s.u.cdr, Qnil)) | 6588 | if (NILP (ptr->u.s.u.cdr)) |
| 6589 | { | 6589 | { |
| 6590 | obj = ptr->u.s.car; | 6590 | obj = ptr->u.s.car; |
| 6591 | cdr_count = 0; | 6591 | cdr_count = 0; |