diff options
| author | Martin Rudalics | 2008-05-01 10:14:44 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2008-05-01 10:14:44 +0000 |
| commit | 92f774f36eca32759f97381e8502444aefb59940 (patch) | |
| tree | bde242c4dd763c4681c450c91477400e55784195 /src | |
| parent | f8748f0fa04855a4dc0be81f7a5d05e4d7cdf730 (diff) | |
| download | emacs-92f774f36eca32759f97381e8502444aefb59940.tar.gz emacs-92f774f36eca32759f97381e8502444aefb59940.zip | |
(struct window): Replace field too_small_ok by field
resize_proportionally.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/window.h b/src/window.h index b2c62fde01f..b0f0dd24fa1 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -222,8 +222,9 @@ struct window | |||
| 222 | /* If redisplay in this window goes beyond this buffer position, | 222 | /* If redisplay in this window goes beyond this buffer position, |
| 223 | must run the redisplay-end-trigger-hook. */ | 223 | must run the redisplay-end-trigger-hook. */ |
| 224 | Lisp_Object redisplay_end_trigger; | 224 | Lisp_Object redisplay_end_trigger; |
| 225 | /* Non-nil means don't delete this window for becoming "too small". */ | 225 | /* Non-nil means resizing windows will attempt to resize this window |
| 226 | Lisp_Object too_small_ok; | 226 | proportionally. */ |
| 227 | Lisp_Object resize_proportionally; | ||
| 227 | 228 | ||
| 228 | /* Original window height and top before mini-window was | 229 | /* Original window height and top before mini-window was |
| 229 | enlarged. */ | 230 | enlarged. */ |
| @@ -337,20 +338,18 @@ struct window | |||
| 337 | #define WINDOW_FRAME_LINE_HEIGHT(W) \ | 338 | #define WINDOW_FRAME_LINE_HEIGHT(W) \ |
| 338 | (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W)))) | 339 | (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W)))) |
| 339 | 340 | ||
| 340 | 341 | /* Return the width of window W in canonical column units. | |
| 341 | /* Return the frame width in canonical column units. | ||
| 342 | This includes scroll bars and fringes. */ | 342 | This includes scroll bars and fringes. */ |
| 343 | 343 | ||
| 344 | #define WINDOW_TOTAL_COLS(W) \ | 344 | #define WINDOW_TOTAL_COLS(W) \ |
| 345 | (XFASTINT ((W)->total_cols)) | 345 | (XFASTINT ((W)->total_cols)) |
| 346 | 346 | ||
| 347 | /* Return the frame height in canonical line units. | 347 | /* Return the height of window W in canonical line units. |
| 348 | This includes header and mode lines, if any. */ | 348 | This includes header and mode lines, if any. */ |
| 349 | 349 | ||
| 350 | #define WINDOW_TOTAL_LINES(W) \ | 350 | #define WINDOW_TOTAL_LINES(W) \ |
| 351 | (XFASTINT ((W)->total_lines)) | 351 | (XFASTINT ((W)->total_lines)) |
| 352 | 352 | ||
| 353 | |||
| 354 | /* Return the total pixel width of window W. */ | 353 | /* Return the total pixel width of window W. */ |
| 355 | 354 | ||
| 356 | #define WINDOW_TOTAL_WIDTH(W) \ | 355 | #define WINDOW_TOTAL_WIDTH(W) \ |