diff options
| author | Gerd Möllmann | 2025-01-08 04:04:49 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2025-01-08 04:04:49 +0100 |
| commit | 2838be3fd554cf5965967e873a52c1e69363f170 (patch) | |
| tree | a88bd632c1e33c2f304c81cfe1922da7dcad7cb9 /src/alloc.c | |
| parent | 2117baac06d6ed7aa84aa12870de2a9e2942a77e (diff) | |
| parent | 601a1f1f2797488ea40292c27945fbfbe1bc3241 (diff) | |
| download | emacs-2838be3fd554cf5965967e873a52c1e69363f170.tar.gz emacs-2838be3fd554cf5965967e873a52c1e69363f170.zip | |
Merge branch 'master' into scratch/igc
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c index c9ff26f2851..0c7036e0d61 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Storage allocation and gc for GNU Emacs Lisp interpreter. | 1 | /* Storage allocation and gc for GNU Emacs Lisp interpreter. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-2024 Free Software Foundation, Inc. | 3 | Copyright (C) 1985-2025 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -7147,9 +7147,11 @@ mark_glyph_matrix (struct glyph_matrix *matrix) | |||
| 7147 | struct glyph *end_glyph = glyph + row->used[area]; | 7147 | struct glyph *end_glyph = glyph + row->used[area]; |
| 7148 | 7148 | ||
| 7149 | for (; glyph < end_glyph; ++glyph) | 7149 | for (; glyph < end_glyph; ++glyph) |
| 7150 | if (STRINGP (glyph->object) | 7150 | { |
| 7151 | && !string_marked_p (XSTRING (glyph->object))) | 7151 | if (STRINGP (glyph->object) |
| 7152 | mark_object (glyph->object); | 7152 | && !string_marked_p (XSTRING (glyph->object))) |
| 7153 | mark_object (glyph->object); | ||
| 7154 | } | ||
| 7153 | } | 7155 | } |
| 7154 | } | 7156 | } |
| 7155 | } | 7157 | } |