aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2021-03-25 08:26:35 -0700
committerPaul Eggert2021-03-25 08:26:35 -0700
commitc3980a3ea67de9f9f997b13ce47fd1e6aca361e4 (patch)
treefc9b35832f9a5d66a4da780b65c1f5b324a12f1d /src
parent8ab85f560eb78e77f743309ee7e331444dd7c5a2 (diff)
parent291a421c2e7420c36a0767f2c1e1d7317022f719 (diff)
downloademacs-c3980a3ea67de9f9f997b13ce47fd1e6aca361e4.tar.gz
emacs-c3980a3ea67de9f9f997b13ce47fd1e6aca361e4.zip
Merge from origin/emacs-27
291a421c2e * admin/make-tarball.txt: Improve and expand the instructi... 0e4795fc98 Fix preeditarea reporting wrong spot.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index d90644819b6..0507dc8f61d 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2783,7 +2783,7 @@ xic_set_preeditarea (struct window *w, int x, int y)
2783 XVaNestedList attr; 2783 XVaNestedList attr;
2784 XPoint spot; 2784 XPoint spot;
2785 2785
2786 spot.x = WINDOW_TO_FRAME_PIXEL_X (w, x) + WINDOW_LEFT_FRINGE_WIDTH (w); 2786 spot.x = WINDOW_TO_FRAME_PIXEL_X (w, x) + WINDOW_LEFT_FRINGE_WIDTH (w) + WINDOW_LEFT_MARGIN_WIDTH(w);
2787 spot.y = WINDOW_TO_FRAME_PIXEL_Y (w, y) + FONT_BASE (FRAME_FONT (f)); 2787 spot.y = WINDOW_TO_FRAME_PIXEL_Y (w, y) + FONT_BASE (FRAME_FONT (f));
2788 attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 2788 attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
2789 XSetICValues (FRAME_XIC (f), XNPreeditAttributes, attr, NULL); 2789 XSetICValues (FRAME_XIC (f), XNPreeditAttributes, attr, NULL);