2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 669c5a0c0b9..56957d655b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fx_show_tip): Add 3 to the 5th arg of SetWindowPos.
+
 2006-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         * editfns.c (TM_YEAR_IN_ASCTIME_RANGE): New macro, identical to
diff --git a/src/w32fns.c b/src/w32fns.c
index 55f4af03d6e..1cc3dc2800c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7668,9 +7668,12 @@ Text larger than the specified size is clipped.  */)
     AdjustWindowRect (&rect, f->output_data.w32->dwStyle,
                       FRAME_EXTERNAL_MENU_BAR (f));
 
-    /* Position and size tooltip, and put it in the topmost group.  */
+    /* Position and size tooltip, and put it in the topmost group.
+       The add-on of 3 to the 5th argument is a kludge: without it,
+       some fonts cause the last character of the tip to be truncated,
+       for some obscure reason.  */
     SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST,
-                  root_x, root_y, rect.right - rect.left,
+                  root_x, root_y, rect.right - rect.left + 3,
                   rect.bottom - rect.top, SWP_NOACTIVATE);
 
     /* Ensure tooltip is on top of other topmost windows (eg menus).  */