summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-07-28 05:39:09 -0400
committerGlenn Morris <rgm@gnu.org>2014-07-28 05:39:09 -0400
commitda41ffdd089b529c3d5216412d95840e065c3fe3 (patch)
treea69f5a510e2c47f774f145d9567188bc89563ac1 /src/window.c
parent414e1537ab09d2f4571e61b420523dcd082f2d3a (diff)
parent1c6c2e3c70ff2f666a1e3f29b8852d375c8392cd (diff)
downloademacs-da41ffdd089b529c3d5216412d95840e065c3fe3.tar.gz
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.c4
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)
}
-/* Set w->pixel_height (w->pixel_height if HORIZONTAL is non-zero) to
+/* Set w->pixel_height (w->pixel_width if HORFLAG is non-zero) to
w->new_pixel for window W and recursively all child windows of W.
Also calculate and assign the new vertical (horizontal) pixel start
positions of each of these windows.
@@ -3944,7 +3944,7 @@ window_resize_apply (struct window *w, bool horflag)
}
-/* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to
+/* Set w->total_lines (w->total_cols if HORFLAG is non-zero) to
w->new_total for window W and recursively all child windows of W.
Also calculate and assign the new vertical (horizontal) start
positions of each of these windows. */