diff options
| author | Juanma Barranquero | 2007-10-04 07:29:55 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-04 07:29:55 +0000 |
| commit | 63bb3d8e60d32bd6ed673a170524ac381f238d4b (patch) | |
| tree | f9330dd0e727a19c23dac1845a637b49a0991b9a /src | |
| parent | 2cb250dd39044b7d07cb62267e04f43b079c0dab (diff) | |
| download | emacs-63bb3d8e60d32bd6ed673a170524ac381f238d4b.tar.gz emacs-63bb3d8e60d32bd6ed673a170524ac381f238d4b.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/frame.h b/src/frame.h index 436656fbe4b..30a0b931cc3 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -78,7 +78,6 @@ struct frame | |||
| 78 | struct Lisp_Vector *next; | 78 | struct Lisp_Vector *next; |
| 79 | 79 | ||
| 80 | /* All Lisp_Object components must come first. | 80 | /* All Lisp_Object components must come first. |
| 81 | Only EMACS_INT values can be intermixed with them. | ||
| 82 | That ensures they are all aligned normally. */ | 81 | That ensures they are all aligned normally. */ |
| 83 | 82 | ||
| 84 | /* Name of this frame: a Lisp string. It is used for looking up resources, | 83 | /* Name of this frame: a Lisp string. It is used for looking up resources, |
| @@ -162,7 +161,7 @@ struct frame | |||
| 162 | /* List of buffers that were viewed, then buried in this frame. The | 161 | /* List of buffers that were viewed, then buried in this frame. The |
| 163 | most recently buried buffer is first. For last-buffer. */ | 162 | most recently buried buffer is first. For last-buffer. */ |
| 164 | Lisp_Object buried_buffer_list; | 163 | Lisp_Object buried_buffer_list; |
| 165 | 164 | ||
| 166 | /* A dummy window used to display menu bars under X when no X | 165 | /* A dummy window used to display menu bars under X when no X |
| 167 | toolkit support is available. */ | 166 | toolkit support is available. */ |
| 168 | Lisp_Object menu_bar_window; | 167 | Lisp_Object menu_bar_window; |
| @@ -176,7 +175,7 @@ struct frame | |||
| 176 | /* Desired and current contents displayed in tool_bar_window. */ | 175 | /* Desired and current contents displayed in tool_bar_window. */ |
| 177 | Lisp_Object desired_tool_bar_string, current_tool_bar_string; | 176 | Lisp_Object desired_tool_bar_string, current_tool_bar_string; |
| 178 | 177 | ||
| 179 | /* beyond here, there should be no more Lisp_Object components. */ | 178 | /* Beyond here, there should be no more Lisp_Object components. */ |
| 180 | 179 | ||
| 181 | /* Cache of realized faces. */ | 180 | /* Cache of realized faces. */ |
| 182 | struct face_cache *face_cache; | 181 | struct face_cache *face_cache; |
| @@ -275,7 +274,7 @@ struct frame | |||
| 275 | /* The terminal device that this frame uses. If this is NULL, then | 274 | /* The terminal device that this frame uses. If this is NULL, then |
| 276 | the frame has been deleted. */ | 275 | the frame has been deleted. */ |
| 277 | struct terminal *terminal; | 276 | struct terminal *terminal; |
| 278 | 277 | ||
| 279 | /* Device-dependent, frame-local auxiliary data used for displaying | 278 | /* Device-dependent, frame-local auxiliary data used for displaying |
| 280 | the contents. When the frame is deleted, this data is deleted as | 279 | the contents. When the frame is deleted, this data is deleted as |
| 281 | well. */ | 280 | well. */ |
| @@ -441,11 +440,11 @@ struct frame | |||
| 441 | /* Set to non-zero in when we want for force a flush_display in | 440 | /* Set to non-zero in when we want for force a flush_display in |
| 442 | update_frame, usually after resizing the frame. */ | 441 | update_frame, usually after resizing the frame. */ |
| 443 | unsigned force_flush_display_p : 1; | 442 | unsigned force_flush_display_p : 1; |
| 444 | 443 | ||
| 445 | /* All display backends seem to need these two pixel values. */ | 444 | /* All display backends seem to need these two pixel values. */ |
| 446 | unsigned long background_pixel; | 445 | unsigned long background_pixel; |
| 447 | unsigned long foreground_pixel; | 446 | unsigned long foreground_pixel; |
| 448 | 447 | ||
| 449 | /* Set to non-zero if the default face for the frame has been | 448 | /* Set to non-zero if the default face for the frame has been |
| 450 | realized. Reset to zero whenever the default face changes. | 449 | realized. Reset to zero whenever the default face changes. |
| 451 | Used to see the difference between a font change and face change. */ | 450 | Used to see the difference between a font change and face change. */ |