diff options
| author | Stefan Monnier | 2007-10-03 23:18:18 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-03 23:18:18 +0000 |
| commit | a390930c456496eda774e0f4d16e37ccc03f656c (patch) | |
| tree | cf630d099221803e60206c7eb18d7ed759d60e3f /src | |
| parent | 9a12ab317d83035d0a77848ebdafd68040ae4fc6 (diff) | |
| download | emacs-a390930c456496eda774e0f4d16e37ccc03f656c.tar.gz emacs-a390930c456496eda774e0f4d16e37ccc03f656c.zip | |
(struct frame): Don't try to GC-mark menu_bar_items_used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c38a2e32f56..1efa2ca302a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-10-03 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * frame.h (struct frame): Don't try to GC-mark menu_bar_items_used. | ||
| 4 | |||
| 1 | 2007-10-02 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2007-10-02 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * window.h (struct window): | 7 | * window.h (struct window): |
diff --git a/src/frame.h b/src/frame.h index c8463625cc9..436656fbe4b 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -152,8 +152,6 @@ struct frame | |||
| 152 | For the format of the data, see extensive comments in xmenu.c. | 152 | For the format of the data, see extensive comments in xmenu.c. |
| 153 | Only the X toolkit version uses this. */ | 153 | Only the X toolkit version uses this. */ |
| 154 | Lisp_Object menu_bar_vector; | 154 | Lisp_Object menu_bar_vector; |
| 155 | /* Number of elements in the vector that have meaningful data. */ | ||
| 156 | EMACS_INT menu_bar_items_used; | ||
| 157 | 155 | ||
| 158 | /* Predicate for selecting buffers for other-buffer. */ | 156 | /* Predicate for selecting buffers for other-buffer. */ |
| 159 | Lisp_Object buffer_predicate; | 157 | Lisp_Object buffer_predicate; |
| @@ -183,6 +181,9 @@ struct frame | |||
| 183 | /* Cache of realized faces. */ | 181 | /* Cache of realized faces. */ |
| 184 | struct face_cache *face_cache; | 182 | struct face_cache *face_cache; |
| 185 | 183 | ||
| 184 | /* Number of elements in `menu_bar_vector' that have meaningful data. */ | ||
| 185 | EMACS_INT menu_bar_items_used; | ||
| 186 | |||
| 186 | /* A buffer to hold the frame's name. We can't use the Lisp | 187 | /* A buffer to hold the frame's name. We can't use the Lisp |
| 187 | string's pointer (`name', above) because it might get relocated. */ | 188 | string's pointer (`name', above) because it might get relocated. */ |
| 188 | char *namebuf; | 189 | char *namebuf; |