[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113023: Possible fix for bug #14630, which continue
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r113023: Possible fix for bug #14630, which continues bug #14062. |
Date: |
Mon, 17 Jun 2013 16:29:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113023
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14630
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-17 19:28:47 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32fns.c w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-06-17 15:28:22 +0000
+++ b/src/ChangeLog 2013-06-17 16:28:47 +0000
@@ -8,6 +8,12 @@
(Fadd_face_text_property): New function that calls
add_text_properties_1.
+2013-06-17 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
Move functions from lisp.h to individual modules when possible.
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2013-05-14 14:09:43 +0000
+++ b/src/w32fns.c 2013-06-17 16:28:47 +0000
@@ -3184,7 +3184,8 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113023: Possible fix for bug #14630, which continues bug #14062.,
Eli Zaretskii <=