From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Sun, 20 Mar 2016 19:38:17 +0100 Message-ID: <56EEEE19.4000800@gmx.at> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458499143 6711 80.91.229.3 (20 Mar 2016 18:39:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Mar 2016 18:39:03 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 20 19:38:53 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ahiFZ-0005SS-0X for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 19:38:53 +0100 Original-Received: from localhost ([::1]:54081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiFY-0004oU-Jg for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 14:38:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiFL-0004oG-IB for emacs-devel@gnu.org; Sun, 20 Mar 2016 14:38:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahiFI-00071u-0R for emacs-devel@gnu.org; Sun, 20 Mar 2016 14:38:39 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:57094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiFH-00071m-NN; Sun, 20 Mar 2016 14:38:35 -0400 Original-Received: from [192.168.1.100] ([212.95.7.62]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0LwGDy-1ZiQeO1Upq-0186Il; Sun, 20 Mar 2016 19:38:22 +0100 In-Reply-To: <83d1qp6on1.fsf@gnu.org> X-Provags-ID: V03:K0:AQR/GLxqcnXUwhrk9XaxJPUasRSWBUK9Hbp4X/LZ4/zY/K7VftW 1Nq9IPG47SqiYW0p6H2KubqFmxCH1M/Ii70100HSRPA3nLAGGo3f138AFA3RvMrGiti9YIR L5dS6M4gBSfRN4Dz5XX1cON6VPHNqSamc0uhLVtkxbi0vMFivDb+HCo2y0Fvrr9Iwv3w8tO pZaNH3MWP6ICENxzEM7Lg== X-UI-Out-Filterresults: notjunk:1;V01:K0:IhLrGamP57I=:CtgiRKGqzzqZ3YW/m2rumz 7G2mVpfgbp/12blRNgY57VV/SuebVxWO4VT6RBPDPo/J+pjSRQyhhTgusyd7crqVy9uKFAToi PKr/KGlyMK3epLu5L0Q7aRCMp5MzDhOYLL3X2WlDWcTiXLN/NxwfOWOmjVutZyUSq6CJtLsyq 7/72PP8vYkUFDTMQnhu9+ml/Qqhv3tceUB6Hc/nU/4kcVwU8nUGwXxYg9x8nPYj57QFNzpkOe UyQPSzK3V0b7g52N53Jv9kzdBIpm9O39kGV2Spt72WsQDMesoPJWoj3qAt2FWqHN6VF1sTGYM pOOo7CBHq8OzEUiwMCitT1qgxKLjBMNjogcxXAvNDqFVgwMFWePWMJCy0StViIVc6IkURkBWg HnVXWEY0/7Pr1JCBAd1rZD2XddMkmOXBtyXbN9e2Jlurms1kZ/TF5jVcW8Dlz6j4xEak187Ns V7khrvP/5/4bY7tzlVEDLRp5+Yx+B/up9g3enfY+CaoJR985rstgYUU8cfEKu/zpvS7akFSEh OWPk6D96kWEpXsG2PkRHpAhy3fR1XxeQStDXh6Zvv0ggW+HbG1VA315kHWVn6qIr9F1Td1VLX gZIkH3B/HdJi5V0aCvQq+sG3sD06aeW1pJkODnlOVCF+QeYtgRAiq/Moolw8SVHFjHHnwj+SL AbxzmzR18x2LvIBF2GsSewtejQ+xFPPle3AFYCwo/of2E14Efgi5brj4Wkw2jCNGNjwMLhws1 O0K9BUrYI202g94tC6+/XYWH6+Yube/lmKGjVb0jLXLK9PIZq6nBcgbN4MDlEnl1G0TaeFXx X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.21 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201953 Archived-At: > How did you conclude that these commits are the culprit? Running git diff fbce4757a874cc43806eb41b8637538b101c3c69..82b089783e71b2aeef950eaecfe4cbc0735e64a2 src/window.c gets me diff --git a/src/window.c b/src/window.c index 8953d3c..add2de3 100644 --- a/src/window.c +++ b/src/window.c @@ -35,13 +35,15 @@ #include "dispextern.h" #include "blockinput.h" #include "termhooks.h" /* For FRAME_TERMINAL. */ -#include "xwidget.h" #ifdef HAVE_WINDOW_SYSTEM #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ #ifdef MSDOS #include "msdos.h" #endif +#ifdef HAVE_XWIDGETS +# include "xwidget.h" +#endif static ptrdiff_t count_windows (struct window *); static ptrdiff_t get_leaf_windows (struct window *, struct window **, @@ -3971,11 +3973,9 @@ depends on the value of (window-start WINDOW), so if calling this } -/* Resize frame F's windows when F's width or height is set to SIZE. - If HORFLAG is zero, F's width was set to SIZE, otherwise its height - was set. SIZE is interpreted in F's canonical character units - (a.k.a. "columns" or "lines"), unless PIXELWISE is non-zero, which - means to interpret SIZE in pixel units. */ +/* Resize frame F's windows when number of lines of F is set to SIZE. + HORFLAG means resize windows when number of columns of F is set to + SIZE. PIXELWISE means to interpret SIZE as pixels. */ void resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) { @@ -4076,7 +4076,7 @@ depends on the value of (window-start WINDOW), so if calling this m = XWINDOW (mini); if (horflag) { - m->total_cols = new_size; + m->total_cols = size; m->pixel_width = new_pixel_size; } else @@ -4371,7 +4371,9 @@ SIDE t (or `right') specifies that the new window shall be located on /* Block input. */ block_input (); +#ifdef HAVE_XWIDGETS xwidget_view_delete_all_in_window (w); +#endif window_resize_apply (p, horflag); /* If this window is referred to by the dpyinfo's mouse highlight, invalidate that slot to be safe (Bug#9904). */ @@ -7263,7 +7265,7 @@ Value is a list of the form (WIDTH COLUMNS VERTICAL-TYPE HEIGHT LINES If this variable is t, splitting a window tries to get the space proportionally from all windows in the same combination. This also -allows splitting a window that is otherwise too small or of fixed size. +allows to split a window that is otherwise too small or of fixed size. Resizing and deleting a window proportionally resize all windows in the same combination. What do you get? martin