aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.h
diff options
context:
space:
mode:
authorPaul Eggert2013-11-28 21:25:25 -0800
committerPaul Eggert2013-11-28 21:25:25 -0800
commit49faeaaf89c820082ba816d089fab5711c9d2b06 (patch)
treed317ea923409fc6948fdc1fd2a7eaaf4d6c08078 /src/window.h
parentc8f0efc2e89d9cfc7befa7f20f584f3f0b12f487 (diff)
downloademacs-49faeaaf89c820082ba816d089fab5711c9d2b06.tar.gz
emacs-49faeaaf89c820082ba816d089fab5711c9d2b06.zip
Fix minor problems found by static checking.
* buffer.h (struct buffer_text, struct buffer): * frame.h (struct frame): * window.h (struct window): Avoid 'bool foo : 1;', as it's not portable to pre-C99 compilers, as described in ../lib/stdbool.in.h. Use 'unsigned foo : 1;' instead. * menu.c (syms_of_menu): Define x-popup-dialog, removing a no-longer-valid use of HAVE_MENUS. * xdisp.c (propagate_buffer_redisplay): Now static.
Diffstat (limited to 'src/window.h')
-rw-r--r--src/window.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/window.h b/src/window.h
index a81c1054070..555c386d7bd 100644
--- a/src/window.h
+++ b/src/window.h
@@ -282,63 +282,63 @@ struct window
282 int window_end_vpos; 282 int window_end_vpos;
283 283
284 /* Non-zero if this window is a minibuffer window. */ 284 /* Non-zero if this window is a minibuffer window. */
285 bool mini : 1; 285 unsigned mini : 1;
286 286
287 /* Meaningful only if contents is a window, non-zero if this 287 /* Meaningful only if contents is a window, non-zero if this
288 internal window is used in horizontal combination. */ 288 internal window is used in horizontal combination. */
289 bool horizontal : 1; 289 unsigned horizontal : 1;
290 290
291 /* Non-zero means must regenerate mode line of this window. */ 291 /* Non-zero means must regenerate mode line of this window. */
292 bool update_mode_line : 1; 292 unsigned update_mode_line : 1;
293 293
294 /* Non-nil if the buffer was "modified" when the window 294 /* Non-nil if the buffer was "modified" when the window
295 was last updated. */ 295 was last updated. */
296 bool last_had_star : 1; 296 unsigned last_had_star : 1;
297 297
298 /* Non-zero means current value of `start' 298 /* Non-zero means current value of `start'
299 was the beginning of a line when it was chosen. */ 299 was the beginning of a line when it was chosen. */
300 bool start_at_line_beg : 1; 300 unsigned start_at_line_beg : 1;
301 301
302 /* Non-zero means next redisplay must use the value of start 302 /* Non-zero means next redisplay must use the value of start
303 set up for it in advance. Set by scrolling commands. */ 303 set up for it in advance. Set by scrolling commands. */
304 bool force_start : 1; 304 unsigned force_start : 1;
305 305
306 /* Non-zero means we have explicitly changed the value of start, 306 /* Non-zero means we have explicitly changed the value of start,
307 but that the next redisplay is not obliged to use the new value. 307 but that the next redisplay is not obliged to use the new value.
308 This is used in Fdelete_other_windows to force a call to 308 This is used in Fdelete_other_windows to force a call to
309 Vwindow_scroll_functions; also by Frecenter with argument. */ 309 Vwindow_scroll_functions; also by Frecenter with argument. */
310 bool optional_new_start : 1; 310 unsigned optional_new_start : 1;
311 311
312 /* Non-zero means the cursor is currently displayed. This can be 312 /* Non-zero means the cursor is currently displayed. This can be
313 set to zero by functions overpainting the cursor image. */ 313 set to zero by functions overpainting the cursor image. */
314 bool phys_cursor_on_p : 1; 314 unsigned phys_cursor_on_p : 1;
315 315
316 /* 0 means cursor is logically on, 1 means it's off. Used for 316 /* 0 means cursor is logically on, 1 means it's off. Used for
317 blinking cursor. */ 317 blinking cursor. */
318 bool cursor_off_p : 1; 318 unsigned cursor_off_p : 1;
319 319
320 /* Value of cursor_off_p as of the last redisplay. */ 320 /* Value of cursor_off_p as of the last redisplay. */
321 bool last_cursor_off_p : 1; 321 unsigned last_cursor_off_p : 1;
322 322
323 /* 1 means desired matrix has been build and window must be 323 /* 1 means desired matrix has been build and window must be
324 updated in update_frame. */ 324 updated in update_frame. */
325 bool must_be_updated_p : 1; 325 unsigned must_be_updated_p : 1;
326 326
327 /* Flag indicating that this window is not a real one. 327 /* Flag indicating that this window is not a real one.
328 Currently only used for menu bar windows of frames. */ 328 Currently only used for menu bar windows of frames. */
329 bool pseudo_window_p : 1; 329 unsigned pseudo_window_p : 1;
330 330
331 /* Non-zero means fringes are drawn outside display margins. 331 /* Non-zero means fringes are drawn outside display margins.
332 Otherwise draw them between margin areas and text. */ 332 Otherwise draw them between margin areas and text. */
333 bool fringes_outside_margins : 1; 333 unsigned fringes_outside_margins : 1;
334 334
335 /* Nonzero if window_end_pos and window_end_vpos are truly valid. 335 /* Nonzero if window_end_pos and window_end_vpos are truly valid.
336 This is zero if nontrivial redisplay is preempted since in that case 336 This is zero if nontrivial redisplay is preempted since in that case
337 the frame image that window_end_pos did not get onto the frame. */ 337 the frame image that window_end_pos did not get onto the frame. */
338 bool window_end_valid : 1; 338 unsigned window_end_valid : 1;
339 339
340 /* True if it needs to be redisplayed. */ 340 /* True if it needs to be redisplayed. */
341 bool redisplay : 1; 341 unsigned redisplay : 1;
342 342
343 /* Amount by which lines of this window are scrolled in 343 /* Amount by which lines of this window are scrolled in
344 y-direction (smooth scrolling). */ 344 y-direction (smooth scrolling). */
@@ -347,7 +347,7 @@ struct window
347 /* Z_BYTE - buffer position of the last glyph in the current matrix of W. 347 /* Z_BYTE - buffer position of the last glyph in the current matrix of W.
348 Should be nonnegative, and only valid if window_end_valid is nonzero. */ 348 Should be nonnegative, and only valid if window_end_valid is nonzero. */
349 ptrdiff_t window_end_bytepos; 349 ptrdiff_t window_end_bytepos;
350}; 350 };
351 351
352/* Most code should use these functions to set Lisp fields in struct 352/* Most code should use these functions to set Lisp fields in struct
353 window. */ 353 window. */