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: Tue, 22 Mar 2016 18:08:53 +0100 Message-ID: <56F17C25.1000205@gmx.at> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <56EFBD68.1050307@gmx.at> <56F0358F.7000103@cs.ucla.edu> <56F11CC8.4000406@gmx.at> <56F1255C.7090301@gmx.at> <56F130E9.2040507@gmx.at> <87shziedyl.fsf@wanadoo.es> 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 1458666577 5186 80.91.229.3 (22 Mar 2016 17:09:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 17:09:37 +0000 (UTC) To: =?UTF-8?B?w5NzY2FyIEZ1ZW50ZXM=?= , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 18:09:28 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 1aiPo7-0003rD-Fn for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 18:09:27 +0100 Original-Received: from localhost ([::1]:38508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPo3-00017Q-EL for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 13:09:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPno-000175-6F for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:09:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPnk-0007aG-4j for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:09:08 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:52512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPnj-0007a6-Qk for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:09:04 -0400 Original-Received: from [192.168.1.100] ([212.95.7.15]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0LcBvB-1a1LLD1hbB-00jZ9V; Tue, 22 Mar 2016 18:08:58 +0100 In-Reply-To: <87shziedyl.fsf@wanadoo.es> X-Provags-ID: V03:K0:gAsaVNLSxmmtnr6rvDOJC7Hdzgycqo2RCTndiq149z7pXM+nb/J 4zoBJv+bORdRWQk6iPvZjgJgNw3dz6QWZhdzyeVhNWVa9iw9oX9XxPKYSaFROVsOmAEgag+ u7qv/w5SiXiDTX7bpdXOwKYpZo5HJPf3sOQ4v/yqPZQ8K2iVoMEyLgoCeyGq2dJtI7LkYgv m8yxEFUES0BijjN3Rzsow== X-UI-Out-Filterresults: notjunk:1;V01:K0:8BWMACfggkA=:vW7owHM/lZyeETmUE9aEbw u7XznSXWM8Xk9HM3mDZG/e9s+FX3zHhHfIH/m0l9vWsNZeCB16DkZQX1JQsQO+7OTnev5nQel wR/uYQY03FQ1p0b/F4CmoXn03YPjdIA1RGDTJlkojl3hcmlga/+SWvvf54O2TZbZB5xF1C8BG 3iIDCnyVj+bdGEQn5rc6g910W+kg9G0fN8wDIsMUwZoIceSQETKWU6kBVnaUzxuors94KJElY 4Fyuxf8+3G+bNL9hLHjmJ9F+CpBnOdqritpofkdnVxx5Y/QNlNMXBWeIsEGmqmaAsXyvsoK4S ++1zYGQ9P/rMKqs4LBblKirkFxm5e6tlMgMkZ5te1qI0hEzEukcVCughXh/M5P/LPo1TGE6df FpS6XenBCywR3SFY71A4CCFo9VtQ2IAr2mECyxwm5KV4fYU1VGbCKHzloFiGq51hwe+bRNi2J XaW/M2BidP4w98iBBAMg1acVJWzp/J8Kdn0eq5XQaYReUT3Dg1nkIPt7UrMpqD//ulsIij6mf L0pxVxHxfXjl2GKJG8NL+SQqcRjn1NuVFMNGV6o+o9XcZHGjDtwaKbkew5YJZnVTMe7Y7z1rH m6zzvwTfVKdAOsRco9RjzUQeHHsXAiZaIoGans++wJXRVML2Qfmm8NgBqr3cKvytwdfXCwYRC eYVBm1eqgRdFPmdGaq8a1gwxQIb4ivpVkkmMgv9U1WFBGiN+6sYbDjNR36fDsgiTc34Tn56Rm cMtdGtuljvxWOz/2SMOk4bpFiCo3k0jSANalMGxn93b0X8b/3WdhZyqTF/1bMwdiJ4omg8Xw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.19 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:202082 Archived-At: > Most probably that git version is too old to support the ^2 syntax. That's what I suspected initially but it turned out that I was just too sloppy when reading the error message. > diff --git a/src/window.c b/src/window.c > index 9e065ea..70b7e58 100644 > --- a/src/window.c > +++ b/src/window.c > @@ -3971,11 +3971,9 @@ values. */) > } > > > -/* 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 +4074,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) > m = XWINDOW (mini); > if (horflag) > { > - m->total_cols = new_size; > + m->total_cols = size; > m->pixel_width = new_pixel_size; > } > else > > > Exactly what I was looking for and what I now get here as well ;-) Thanks, martin