From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Third Newsgroups: gmane.emacs.bugs Subject: bug#32932: [PATCH v2] Fix more drawing bugs in NS port (bug#32932) Date: Wed, 14 Nov 2018 18:19:26 +0000 Message-ID: References: <20181109090855.GA31723@breton.holly.idiocy.org> <20181113221336.GA65891@breton.holly.idiocy.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000002182e3057aa3fa2d" X-Trace: blaine.gmane.org 1542219487 18215 195.159.176.226 (14 Nov 2018 18:18:07 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 14 Nov 2018 18:18:07 +0000 (UTC) Cc: Boris Buliga , 32932@debbugs.gnu.org To: Aaron Jensen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 14 19:18:02 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMzjm-0004cZ-9q for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Nov 2018 19:18:02 +0100 Original-Received: from localhost ([::1]:33672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMzls-00084P-Gm for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Nov 2018 13:20:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMzll-000841-Md for bug-gnu-emacs@gnu.org; Wed, 14 Nov 2018 13:20:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMzli-0000w3-J8 for bug-gnu-emacs@gnu.org; Wed, 14 Nov 2018 13:20:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48254) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMzli-0000vx-Fj for bug-gnu-emacs@gnu.org; Wed, 14 Nov 2018 13:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gMzli-000753-8y for bug-gnu-emacs@gnu.org; Wed, 14 Nov 2018 13:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Nov 2018 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32932 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32932-submit@debbugs.gnu.org id=B32932.154221958627191 (code B ref 32932); Wed, 14 Nov 2018 18:20:02 +0000 Original-Received: (at 32932) by debbugs.gnu.org; 14 Nov 2018 18:19:46 +0000 Original-Received: from localhost ([127.0.0.1]:52512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMzlR-00074V-My for submit@debbugs.gnu.org; Wed, 14 Nov 2018 13:19:45 -0500 Original-Received: from mail-io1-f49.google.com ([209.85.166.49]:41088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMzlQ-00074I-2W for 32932@debbugs.gnu.org; Wed, 14 Nov 2018 13:19:44 -0500 Original-Received: by mail-io1-f49.google.com with SMTP id s22so552063ioc.8 for <32932@debbugs.gnu.org>; Wed, 14 Nov 2018 10:19:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=N4lGo6yTkyO6pWBdJg+3vZMum/WxrDiaEgxraTOUtvI=; b=RSpA3N9W42uNzqVcC8l0QbWyddzFrgfKTXpr3x9i9WNzg/RuMgFCnFavqXgQDhE28q JtTBWQr+UNiJFc/wAClrVpC78BqgOeOMLx7IUaVd71ywVWY5c9rpN70qw2+SebtXKem/ q+xnZsV96pVgV+AAvPAf5c2aVA+UOf6jM3Ww/sl3AUwHgRiDGWikUrcHtZt8v4HfUW1Q ZPdX7+Rvn6FCJ9E9fsHzsoeh3W2ujzJEpNBfXvFrSaZlqK2DhykQwsPEwlOzy9qGLMMf g3mpp8QfP3ZDGruAy3+tzNiCf3NlVElqrECFzyDIBUY5LGcH1FzqFjXyRTCULIvPgJt7 kgww== X-Gm-Message-State: AGRZ1gLZsDjJvzRHfVvdOKPNb9LjjcQ0DmOr/S26oXNmMMU5yh8El23B sWLBY5BwYvQ3q9+hoFHcZbB/r5NL2i2e1mDC7QE= X-Google-Smtp-Source: AJdET5esfsttVTSWKfqNmlAI3RR/rHPV6EdMJJCL934rYNZzV9JJy13QP714zl+78+LGYwR2SzIA8Koo3PqXp201T4g= X-Received: by 2002:a6b:b717:: with SMTP id h23mr2248663iof.14.1542219578309; Wed, 14 Nov 2018 10:19:38 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:152394 Archived-At: --0000000000002182e3057aa3fa2d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I suspect that's due to the whitespace checks that the Emacs tree builds into git. I know there's a way to disable them, but I don't know what. You could just try reverting the commits yourself and then extracting the 4th patch from the file and applying it. On Wed, 14 Nov 2018, 17:09 Aaron Jensen On November 13, 2018 at 2:13:41 PM, Alan Third > (alan@idiocy.org(mailto:alan@idiocy.org)) wrote: > > > OK, so all new patch. It should apply to emacs-26 without any > > additional patches (and might be OK for master too). Just the usual > > =E2=80=99git am=E2=80=99 should apply all four, I believe. > > I=E2=80=99m not sure if I=E2=80=99m doing something wrong, but git am sto= ps after > applying 2 commits and leaves me with a dirty tree (src/nsterm.m is > staged). I=E2=80=99ve tried on emacs-26 and master. > > $ g am draw-to-buffer.mbox > Applying: Revert "Fix some NS drawing issues (bug#32932)" > Applying: Revert "Ensure NS frame is redrawn correctly after scroll" > Applying: Revert "Make all NS drawing be done from drawRect" > .git/rebase-apply/patch:493: space before tab in indent. > when making the call to draw_phys..(), don't focus in that > .git/rebase-apply/patch:494: space before tab in indent. > case, then move the ns_unfocus() here after that call. */ > warning: 2 lines add whitespace errors. > src/nsterm.m:3141: space before tab in indent. > + when making the call to draw_phys..(), don't focus in that > src/nsterm.m:3142: space before tab in indent. > + case, then move the ns_unfocus() here after that call. */ > > After this, git am --continue simply repeats the last set of warnings. > > Aaron > > > > --0000000000002182e3057aa3fa2d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I suspect that's due to the whitespace checks that th= e Emacs tree builds into git. I know there's a way to disable them, but= I don't know what.

You co= uld just try reverting the commits yourself and then extracting the 4th pat= ch from the file and applying it.

On Wed, 14 Nov 2018, 17:09 Aaron Jensen <aaronjensen@gmail.com wrote:
On November 13, 2018 at 2:13:41 PM, Alan Third (al= an@idiocy.org(mailto:alan@idiocy.org)) wrote:

> OK, so all new patch. It should apply to emacs-26 without any
> additional patches (and might be OK for master too). Just the usual > =E2=80=99git am=E2=80=99 should apply all four, I believe.

I=E2=80=99m not sure if I=E2=80=99m doing something wrong, but git am stops= after
applying 2 commits and leaves me with a dirty tree (src/nsterm.m is
staged). I=E2=80=99ve tried on emacs-26 and master.

$ g am draw-to-buffer.mbox
Applying: Revert "Fix some NS drawing issues (bug#32932)"
Applying: Revert "Ensure NS frame is redrawn correctly after scroll&qu= ot;
Applying: Revert "Make all NS drawing be done from drawRect"
.git/rebase-apply/patch:493: space before tab in indent.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0when making the call to draw_phys.= .(), don't focus in that
.git/rebase-apply/patch:494: space before tab in indent.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case, then move the ns_unfocus() h= ere after that call. */
warning: 2 lines add whitespace errors.
src/nsterm.m:3141: space before tab in indent.
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0when making the call to draw_phys..(), = don't focus in that
src/nsterm.m:3142: space before tab in indent.
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case, then move the ns_unfocus() here a= fter that call. */

After this, git am --continue simply repeats the last set of warnings.

Aaron



--0000000000002182e3057aa3fa2d--