From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 16:20:50 +0100 Message-ID: <87shziedyl.fsf@wanadoo.es> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458660125 24230 80.91.229.3 (22 Mar 2016 15:22:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 15:22:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 16:21:56 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 1aiO82-0000O4-SK for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 16:21:55 +0100 Original-Received: from localhost ([::1]:37739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiO7z-0002fh-53 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 11:21:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiO7f-0002fb-Hn for emacs-devel@gnu.org; Tue, 22 Mar 2016 11:21:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiO7Z-00009j-Mg for emacs-devel@gnu.org; Tue, 22 Mar 2016 11:21:31 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:59208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiO7Z-00009d-FU for emacs-devel@gnu.org; Tue, 22 Mar 2016 11:21:25 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1aiO7F-0008OP-Vk for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:21:15 +0100 Original-Received: from 151.red-79-153-146.dynamicip.rima-tde.net ([79.153.146.151]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 16:21:05 +0100 Original-Received: from ofv by 151.red-79-153-146.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 16:21:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 44 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 151.red-79-153-146.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) Cancel-Lock: sha1:iTq+R0QVcD/4FdsUZKS7kW0ZU+w= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:202071 Archived-At: martin rudalics writes: >> git diff 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa^2 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa -- src/window.c > > With git version 1.9.4.msysgit.2 (on Windows) this gets me > > git diff 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa^2 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa -- src/window.c > fatal: bad revision '9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa2' Most probably that git version is too old to support the ^2 syntax. Please install the latest Git for Windows: https://git-for-windows.github.io/ The output is 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