diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-06-17 19:28:47 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-06-17 19:28:47 +0300 |
| commit | ca46332555c0284d34d0611cf2653d86fd7fac00 (patch) | |
| tree | f0b013797a9e9426b21b36637a5302552e148787 /src | |
| parent | 254408ca2e35dce8e264f32389963a2167f70da3 (diff) | |
| download | emacs-ca46332555c0284d34d0611cf2653d86fd7fac00.tar.gz | |
Possible fix for bug #14630, which continues bug #14062.
src/w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
unless we know that the window w's frame is a frame object.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32fns.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0b3c45711dc..e89cfc25728 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,6 +8,12 @@ (Fadd_face_text_property): New function that calls add_text_properties_1. +2013-06-17 Eli Zaretskii <eliz@gnu.org> + + * w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT + unless we know that the window w's frame is a frame object. + Another attempt at solving bug#14062 and bug#14630. + 2013-06-17 Paul Eggert <eggert@cs.ucla.edu> Move functions from lisp.h to individual modules when possible. diff --git a/src/w32fns.c b/src/w32fns.c index d7ac0dd1a6c..970c44ce264 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3184,7 +3184,8 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) form.rcArea.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, 0); form.rcArea.top = WINDOW_TOP_EDGE_Y (w); - if (BUFFERP (w->contents)) + if (BUFFERP (w->contents) + && FRAMEP (WINDOW_FRAME (w))) form.rcArea.top += WINDOW_HEADER_LINE_HEIGHT (w); form.rcArea.right = (WINDOW_BOX_RIGHT_EDGE_X (w) - WINDOW_RIGHT_MARGIN_WIDTH (w) |