diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
| commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
| tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /src/lread.c | |
| parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
| parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
| download | emacs-xwidget_mvp.tar.gz | |
merge masterxwidget_mvp
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index 74a5fdfe67b..25e3ff01d47 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,6 +1,6 @@ /* Lisp parsing and input streams. -Copyright (C) 1985-1989, 1993-1995, 1997-2015 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1995, 1997-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3720,7 +3720,11 @@ static size_t oblookup_last_bucket_number; Lisp_Object check_obarray (Lisp_Object obarray) { - if (!VECTORP (obarray) || ASIZE (obarray) == 0) + /* We don't want to signal a wrong-type-argument error when we are + shutting down due to a fatal error, and we don't want to hit + assertions in VECTORP and ASIZE if the fatal error was during GC. */ + if (!fatal_error_in_progress + && (!VECTORP (obarray) || ASIZE (obarray) == 0)) { /* If Vobarray is now invalid, force it to be valid. */ if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; |