diff options
| author | Stefan Monnier | 2014-11-16 00:22:20 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-11-16 00:22:20 -0500 |
| commit | 9075fcc1937a211bc91e8bc49c332bc55ac99e24 (patch) | |
| tree | 1cff4991107011e0b5d13fac46b0881c30d31a63 /src/window.h | |
| parent | 86009dd5d886f1101358990e4f8f69a5d1467eb8 (diff) | |
| parent | 4f4cf9c855f5818d4c3c0fb772db8bbcf4f33780 (diff) | |
| download | emacs-9075fcc1937a211bc91e8bc49c332bc55ac99e24.tar.gz emacs-9075fcc1937a211bc91e8bc49c332bc55ac99e24.zip | |
Merge from emacs-24
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index ea5dddc9fc8..4e4c65b83e6 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -519,7 +519,7 @@ wset_next_buffers (struct window *w, Lisp_Object val) | |||
| 519 | #define WINDOW_FRAME_COLUMN_WIDTH(W) \ | 519 | #define WINDOW_FRAME_COLUMN_WIDTH(W) \ |
| 520 | (FRAME_COLUMN_WIDTH (WINDOW_XFRAME ((W)))) | 520 | (FRAME_COLUMN_WIDTH (WINDOW_XFRAME ((W)))) |
| 521 | 521 | ||
| 522 | /* Return the canonical column width of the frame of window W. */ | 522 | /* Return the canonical line height of the frame of window W. */ |
| 523 | #define WINDOW_FRAME_LINE_HEIGHT(W) \ | 523 | #define WINDOW_FRAME_LINE_HEIGHT(W) \ |
| 524 | (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W)))) | 524 | (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W)))) |
| 525 | 525 | ||