From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mark Oteiza Newsgroups: gmane.emacs.devel Subject: Re: master c430f7e breaks diff-mode fontification Date: Mon, 27 Jun 2016 16:58:28 -0400 Message-ID: <20160627205828.GA1412@holos.localdomain> References: <20160623212912.4921.57688@vcs.savannah.gnu.org> <20160623212913.536AF220129@vcs.savannah.gnu.org> <87k2hbasut.fsf_-_@gmx.net> <878txqzney.fsf@gmx.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1467061156 27156 80.91.229.3 (27 Jun 2016 20:59:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 27 Jun 2016 20:59:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 27 22:59:10 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 1bHdcc-0007k2-8E for ged-emacs-devel@m.gmane.org; Mon, 27 Jun 2016 22:59:10 +0200 Original-Received: from localhost ([::1]:32828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHdcb-0005TI-D3 for ged-emacs-devel@m.gmane.org; Mon, 27 Jun 2016 16:59:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHdc4-0005T1-UV for emacs-devel@gnu.org; Mon, 27 Jun 2016 16:58:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHdbz-00023M-Vs for emacs-devel@gnu.org; Mon, 27 Jun 2016 16:58:35 -0400 Original-Received: from mail-qk0-x231.google.com ([2607:f8b0:400d:c09::231]:34596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHdbz-00023D-Qj for emacs-devel@gnu.org; Mon, 27 Jun 2016 16:58:31 -0400 Original-Received: by mail-qk0-x231.google.com with SMTP id t127so226960697qkf.1 for ; Mon, 27 Jun 2016 13:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=udel-edu.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=/79sXdiIDlsi/5r3F0TFvDGH6N79YyEiQvU55DbS0/E=; b=yqHWT32uqX1SBVZqqzQbxTqy5fSLilOZ2c7sE4smcES2aCcvXvKgwt9cmL4s2fgUgw VnvqEo85TdO2VKe6V1tY7w/VMSfmpbQuCAHAQ3gUagT0KmCPgRkX8YYlPYzlDgBEE1nm ph3bUnUHXzgteke8aOJkCzdBnZk8t6s/MJC4DmCXCoVJCLpdw5FRB9eNGemtEJUBut+o IFi0Cx5x0DxdEvi4Eq5N9rNa9UvvxXSvy7QG2TFlY97fLZigOwV+qWL1GbMaHDPKw1Qc zfVhnYJ41Rs5yI0u1+LLwH33tGd1nt355TKTFPJtQ7zuPU78g9+JWCfNRrO1U15X6L0C ZTBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=/79sXdiIDlsi/5r3F0TFvDGH6N79YyEiQvU55DbS0/E=; b=UutGjWG5FynfBYb7a/6SsuYtO718jSjTcyaHsbojcUiPiE0t311QLsMy0oenAF66Cg IRGcieUqLw89zd1Ri/rVzwQ61pmi0iuA2zP1Vadf0XQU3l7P8ik14JFrtyCutY4pL0oD gxOdL1wQxPzznUpv01yXctYA5YD7SQVpUF38tknwwzueQ2k1xI/apnAjZ4sHutgJZ8+r vT8c2QKbhFxsTOomVKe1BxsN20FnoN59U7Rimx/kE5s8J/rR0oxiwX+kIl8UraQ1ywxI hthGZf7rJHx2G4RDEtumWsECNFCDEhPs08BS6MZO6XIeeIIcbJGoKMvAQM0C0668qnI0 RrCQ== X-Gm-Message-State: ALyK8tLffAyCm9RFHZ5YN5TdP36Mo0pzJ6FyE+gIZsxypBtjy4Dju5yP1onKP72mdyTxC9JV X-Received: by 10.55.165.69 with SMTP id o66mr26940401qke.153.1467061110610; Mon, 27 Jun 2016 13:58:30 -0700 (PDT) Original-Received: from holos.localdomain (ip68-100-200-121.dc.dc.cox.net. [68.100.200.121]) by smtp.gmail.com with ESMTPSA id p13sm278031qke.7.2016.06.27.13.58.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 13:58:29 -0700 (PDT) Original-Received: by holos.localdomain (Postfix, from userid 1000) id AB4F869683; Mon, 27 Jun 2016 16:58:28 -0400 (EDT) Content-Disposition: inline In-Reply-To: <878txqzney.fsf@gmx.net> User-Agent: Mutt/1.6.1+53 (91af19866bbd) (2016-04-27) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::231 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:204838 Archived-At: On 27/06/16 at 05:01pm, Stephen Berman wrote: > On Mon, 27 Jun 2016 11:22:50 +0200 Stephen Berman wrote: > > > This change breaks diff-mode fontification: > > > >> branch: master > >> commit c430f7e23fc2c22f251ace4254e37dea1452dfc3 > >> Author: Mark Oteiza > >> Commit: Mark Oteiza > >> > >> Remove some face aliases obsoleted in 22.1 > > > > To reproduce (after git pull and make bootstrap): > > > > 0. emacs -Q > > 1. C-x v L RET RET > > 2. In the *vc-change-log* buffer type `d' on one of the entries. > > => The diff displayed in the *vc-diff* buffer lack the expected faces on > > the removed and added lines, and the *Messages* buffer contains these > > messages: > > Error during redisplay: (jit-lock-function 1) signaled (void-variable > > diff-hunk-header) > > Error during redisplay: (jit-lock-function 501) signaled (void-variable diff-removed) > > Error during redisplay: (jit-lock-function 1001) signaled (void-variable > > diff-hunk-header) > > Error during redisplay: (jit-lock-function 1501) signaled (void-variable diff-context) > > > > If prior to step 1 above I evaluate the file diff-mode.el from emacs-25 > > (i.e. the version before the above commit), then after 2 the *vc-diff* > > buffer is fontified as expected and there no such error messages in *Messages*. > > The following patch fixes the breakage. (I haven't yet gone through the > other files changed by commit c430f7e to see if there are similar > problems.) Thanks, applied. It's clear to me now why this broke, so I'll have a closer look as well. >