From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Patch ok for release branch? Date: Thu, 12 Jan 2023 08:39:36 +0800 Message-ID: <87sfggegc7.fsf@yahoo.com> References: <87sfggegc7.fsf.ref@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9389"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jan 12 01:57:06 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pFltx-0001xa-FF for ged-emacs-devel@m.gmane-mx.org; Thu, 12 Jan 2023 01:57:05 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFldN-0000p7-89; Wed, 11 Jan 2023 19:39:57 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFldK-0000oY-F3 for emacs-devel@gnu.org; Wed, 11 Jan 2023 19:39:54 -0500 Original-Received: from sonic302-22.consmr.mail.ne1.yahoo.com ([66.163.186.148]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFldI-0002D9-A6 for emacs-devel@gnu.org; Wed, 11 Jan 2023 19:39:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1673483988; bh=xKPTyj3anjA1kOSYyXdU3R7e/sFnWgsJGUsn72UCqYI=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=eK+WphATfuEgYareXMiwxZ5Eg/JL6iLUUuvo9IazxSR5khoH2PDz2XHAe+vOTnlhDIA3+zfhM/+GzudV9VSGVYosEoEdbUV4p2xJd7OdgXOF5MyiryDhlsCBFbM+P9K0NtXw/0d6iF9rSeTpeYkxTK+TDwGvQfW8486pxJlNbLRHjMdmjiLID9cDq6LEfhjdC6CAUEkYBO5REcCpqGwwxOalWwzjs9//ufAHZk+z7wMwE5Dlm0T5uy6dIqx5CjoRno0KKiVhGWavzhNvRnaFXBTmw1zHGZ0kVJEbQH1l3EC8CqcbrrwwE3qh6o6FkJubrZzY1++1NEMT2A/LXTUxnQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1673483988; bh=wHiOeYorK7ZGLpJYOo/Ct6KpBl/OmwfcfmVYe1OcYhb=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=iOiOwoLNpzzzmICXYbT/KAmgIrvkXa2accjD6SaAkf1vA5gAW3RzspTb2FJlWdFesSiDFFE/HEBomYplu5pNKEbjtxwTeRDu4QGB90aDmKdALbMXywPQo+CBJXDZb54dhogOtq5odhVX+CE309J7kYt6XbLqMYpTfaUek9dhGCUvIcbKtq62NR+lc7iNPozEBG89VgWiE0uxN1V4PsmElQnX7xAAaDbU1YDekNbPoPW0O9PmxdbBCyW4nHo7jA8LlNYZy+riCMnPYDUYyXdjmh2jlgcEOHCwlF4BwCtiJ0+Tz86k1Pspw5faPwqOBq3f3h5VRWT88FfhGHQKdY94Qw== X-YMail-OSG: 2YJreI4VM1nqUcIP7p8iEIrE.8O2_PYEgn9sd_mSCJG6.2b9QTaDR2CFlVMvjvJ RzowE59wlJjxAdZqP14HlEeMSaOydFm2pAYXeqAV5voaoU2rQWZJBurtF_bju_oFQa9gJzd3tOuY Xtn55sYhIwpMUjKuZkJ3zGnJykbW2VGsidNYnCkF0Idmaz2NaE0PfjF2oJwQNXAU51.ObxbY4wmX okKwsqI8oBt3q8gYLvcaa29zZXTCZilt_aX0y5mnmvIHupzmWkydqNWoUaIPAuRtHIe.NhGaqmLu HKp0tAwI4y8Cz7aJTyaTPYtdKpPA_mWWu9mXoV.rqj7XDOB8TYkpqa2Kv5zI4XlPRCAwFLs3bmBo nL5eBBbybsGvdkehP.lTL9GjlQe__y._NbRFdi9ALCbayj4mPEHe6lixJ3AwYmQaqmUnqFEQKNoG nIfZX.z_fBlrueCLchjlk50D3eIMtxYLarZrP2CZwWBFGB_dSrsvndgnuMOAhsF9za95hKAtQyCS liHRO0D3Gy6NbALzffWfhk_XTxYjueowakWwZ8vJrTflyg38Y4lSvk4GUBdK4s.f8YB2brhCIFgn sj.ChwxWhP8Rwk4fEP8xSzs8Blg7IO39MLbnQoIn0wgWYU6HZZhSMVY3t_VXj.bQWw344Sf736vD .2eAvHnZgqzSrN.RD6LrNfEOgU4Kb8S0JbVmkc9MDAEQPlOoIOBoTlLtmpy03B3vh5uxF_ELNczs Q2.r.5Hxes0GI2sVUpBHjwhFutDJHuSC68yyZ.H6XRlXjYnrrTSBgFlFYeJzTrKFSb1fmyJ7SQxm P9b804mSV4fG0Sv4Yid4jATwprsX46iI0_MigpOUpe X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.ne1.yahoo.com with HTTP; Thu, 12 Jan 2023 00:39:48 +0000 Original-Received: by hermes--production-sg3-5ff5bbd69d-4dcm6 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID ea8381f40da31fd9cbaf5d7c92bb5e0a; Thu, 12 Jan 2023 00:39:44 +0000 (UTC) X-Mailer: WebService/1.1.21062 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.186.148; envelope-from=luangruo@yahoo.com; helo=sonic302-22.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:302363 Archived-At: Is this OK for Emacs 29? It fixes a bug where the input method popup appears at the wrong location when a margin is enabled. diff --git a/src/pgtkterm.c b/src/pgtkterm.c index 13f6c6c3c4d..9190649f414 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c @@ -2959,7 +2959,8 @@ pgtk_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x, if (w == XWINDOW (f->selected_window)) { int frame_x = (WINDOW_TO_FRAME_PIXEL_X (w, x) - + WINDOW_LEFT_FRINGE_WIDTH (w)); + + WINDOW_LEFT_FRINGE_WIDTH (w) + + WINDOW_LEFT_MARGIN_WIDTH (w)); int frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, y); pgtk_im_set_cursor_location (f, frame_x, frame_y, w->phys_cursor_width,