diff options
| author | Glenn Morris | 2014-07-28 05:39:09 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-07-28 05:39:09 -0400 |
| commit | da41ffdd089b529c3d5216412d95840e065c3fe3 (patch) | |
| tree | a69f5a510e2c47f774f145d9567188bc89563ac1 /src/window.c | |
| parent | 414e1537ab09d2f4571e61b420523dcd082f2d3a (diff) | |
| parent | 1c6c2e3c70ff2f666a1e3f29b8852d375c8392cd (diff) | |
| download | emacs-da41ffdd089b529c3d5216412d95840e065c3fe3.tar.gz emacs-da41ffdd089b529c3d5216412d95840e065c3fe3.zip | |
Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index ae28b714720..e3554ea032e 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3854,7 +3854,7 @@ window_resize_check (struct window *w, bool horflag) | |||
| 3854 | } | 3854 | } |
| 3855 | 3855 | ||
| 3856 | 3856 | ||
| 3857 | /* Set w->pixel_height (w->pixel_height if HORIZONTAL is non-zero) to | 3857 | /* Set w->pixel_height (w->pixel_width if HORFLAG is non-zero) to |
| 3858 | w->new_pixel for window W and recursively all child windows of W. | 3858 | w->new_pixel for window W and recursively all child windows of W. |
| 3859 | Also calculate and assign the new vertical (horizontal) pixel start | 3859 | Also calculate and assign the new vertical (horizontal) pixel start |
| 3860 | positions of each of these windows. | 3860 | positions of each of these windows. |
| @@ -3944,7 +3944,7 @@ window_resize_apply (struct window *w, bool horflag) | |||
| 3944 | } | 3944 | } |
| 3945 | 3945 | ||
| 3946 | 3946 | ||
| 3947 | /* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to | 3947 | /* Set w->total_lines (w->total_cols if HORFLAG is non-zero) to |
| 3948 | w->new_total for window W and recursively all child windows of W. | 3948 | w->new_total for window W and recursively all child windows of W. |
| 3949 | Also calculate and assign the new vertical (horizontal) start | 3949 | Also calculate and assign the new vertical (horizontal) start |
| 3950 | positions of each of these windows. */ | 3950 | positions of each of these windows. */ |