From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#49197: [PATCH] 28.0.50; Inability to find "diff" prevents `font-lock-add-keywords' from working in `diff-mode' Date: Wed, 23 Jun 2021 14:00:05 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000089e7a905c5753126" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34825"; mail-complaints-to="usenet@ciao.gmane.io" To: 49197@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jun 23 23:01:20 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lw9zp-0008wG-Um for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 23 Jun 2021 23:01:18 +0200 Original-Received: from localhost ([::1]:51712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lw9zo-0002Vp-VW for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 23 Jun 2021 17:01:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lw9zb-0002UO-2q for bug-gnu-emacs@gnu.org; Wed, 23 Jun 2021 17:01:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lw9za-0001j7-Ra for bug-gnu-emacs@gnu.org; Wed, 23 Jun 2021 17:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lw9za-0005Z3-E4 for bug-gnu-emacs@gnu.org; Wed, 23 Jun 2021 17:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Jun 2021 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49197 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.162448202421333 (code B ref -1); Wed, 23 Jun 2021 21:01:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 21:00:24 +0000 Original-Received: from localhost ([127.0.0.1]:41929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lw9yx-0005Y1-Rd for submit@debbugs.gnu.org; Wed, 23 Jun 2021 17:00:24 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:38998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lw9yw-0005Xt-Dn for submit@debbugs.gnu.org; Wed, 23 Jun 2021 17:00:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lw9yu-0002F9-6g for bug-gnu-emacs@gnu.org; Wed, 23 Jun 2021 17:00:22 -0400 Original-Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:38780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lw9ys-00010h-13 for bug-gnu-emacs@gnu.org; Wed, 23 Jun 2021 17:00:19 -0400 Original-Received: by mail-pf1-x429.google.com with SMTP id c8so3332230pfp.5 for ; Wed, 23 Jun 2021 14:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=SNpdctmIfRgT8OjJNFEkTY/tsDVw/69o2zpn8y5aLQw=; b=tK2yHnA0mKLDN/W6/mzTHValPW/u2s3DkixpTcQhY97xdSD4/KCBD4qZEN1AQRSoCN M9+R0+15Zr2Lb/jXxzPUkvgLZHBy0Sf2O+34/v6eb7cFP8SOOmEV6HP5N1vR+fhQMfgQ KnG4jmeC87GH5j0Fxo46IX6HDw85oikAsuQ45OdDmJQppbhQ4mViiZhtJHPK/Bqxnvrv XK923im/X1I9SG1wSb4TaLPslGmGov4+Xyq95vZFYcM8UNto1bGVIV5sl+ehzzKfcDyE bMU2/8Srp20ALPumfM4xrWAn+3q+7nufsV1dlv7cAdbL5m9s94L66ED2MTYfX+sBj61A udWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=SNpdctmIfRgT8OjJNFEkTY/tsDVw/69o2zpn8y5aLQw=; b=HjR32nmpU40O0OZsPkyK81rgMi8LpwDksnNhyQS0bbo7IyUjTqC892NHRa2RfmMTNf 5n4b+GwbTv6I68qWep6HYF9VQQKhr3YLTgfP9zLaXW58ND11U20EpUeWWL4uJGxPDMtU s1saJ3yfiNumDWAnN9HlJUHWtUTGkxMlsuOQ+OplqVtVtFxFdNXfYmXZOpbdKl+99PGg xlDf39WBLkiRSRS0z+QQIAVkoltwchKtgYbCql1tEcCA14idwk6lUE1P00zzrcY1AT6t NykUmy4XD/DAjpNstz6h4KsFSRq7GQyW4eAYkzdXyVV4g2EJsyIlKZ0fqYIvD5+wORY1 mXdg== X-Gm-Message-State: AOAM531bItSTdfsctwxK2Gvh53W8LMChW4yeM4EBaygmlqfGkqkeazYF DIzB8CYsVMyVQt67IOR/tSI/YfqemBP4B0DUe2TuxbsxBuM= X-Google-Smtp-Source: ABdhPJw5WtivZIqETeeZcK1vVNJkmACqBg0yXc26fVY4hlFzzWDSOSgC6bDqc22Uh4jxRM82heLNHGVaUOuScJ26oJ4= X-Received: by 2002:a65:41c6:: with SMTP id b6mr1308973pgq.206.1624482016510; Wed, 23 Jun 2021 14:00:16 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:208915 Archived-At: --00000000000089e7a905c5753126 Content-Type: text/plain; charset="UTF-8" This is a very minor issue that I happened to stumble upon. On systems without "diff", adding a new font-lock rule via `font-lock-add-keywords' doesn't do anything. This is (if I'm understanding things correctly) because the diff-refined code will signal an error, terminating the font-lock code early. Since `diff--font-lock-refined' is normally the last element in the list, this only causes issues when a user has added more font-lock rules. To see the problem in action, you can do the following: emacs -Q (setq diff-command "nonexist") (add-hook 'diff-mode-hook (lambda () (font-lock-add-keywords nil '(("^..*?\\([[:blank:]]+\\)$" 1 'trailing-whitespace prepend)) t))) C-x C-f diff-trailing-ws.patch ;; Attached ;; The added line should be highlighted with `trailing-whitespace', ;; but it isn't. I've attached a patch for this which ignores `file-missing' errors when using diff-refined during font-locking. With the patch, running the above steps correctly highlights trailing whitespace. --00000000000089e7a905c5753126 Content-Type: application/octet-stream; name="0001-Ignore-file-missing-errors-during-diff-refined-font-.patch" Content-Disposition: attachment; filename="0001-Ignore-file-missing-errors-during-diff-refined-font-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kq9yg2oz0 RnJvbSA1MTU0NTMzZGE3YWYxZTA3ZDFjZTI2MzBjYmFlNWM0ODkyZWViNDQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IFdlZCwgMjMgSnVuIDIwMjEgMTM6NTI6NTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBJZ25v cmUgZmlsZS1taXNzaW5nIGVycm9ycyBkdXJpbmcgZGlmZi1yZWZpbmVkIGZvbnQtbG9ja2luZwoK KiBsaXNwL3ZjL2RpZmYtbW9kZS5lbCAoZGlmZi0tZm9udC1sb2NrLXJlZmluZWQpOiBJZ25vcmUg ZmlsZS1taXNzaW5nCmVycm9ycy4KLS0tCiBsaXNwL3ZjL2RpZmYtbW9kZS5lbCB8IDI1ICsrKysr KysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAx MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3ZjL2RpZmYtbW9kZS5lbCBiL2xpc3Av dmMvZGlmZi1tb2RlLmVsCmluZGV4IGEwMDkzMzkxYzYuLjQ2NTJhZmExZjkgMTAwNjQ0Ci0tLSBh L2xpc3AvdmMvZGlmZi1tb2RlLmVsCisrKyBiL2xpc3AvdmMvZGlmZi1tb2RlLmVsCkBAIC0yMjY1 LDE3ICsyMjY1LDIwIEBAIGRpZmYtLWZvbnQtbG9jay1yZWZpbmVkCiAgICAgICA7OyBzYW1lIGh1 bmsuCiAgICAgICAoZ290by1jaGFyIChuZXh0LXNpbmdsZS1jaGFyLXByb3BlcnR5LWNoYW5nZQog ICAgICAgICAgICAgICAgICAgKHBvaW50KSAnZGlmZi0tZm9udC1sb2NrLXJlZmluZWQgbmlsIG1h eCkpKQotICAgIChkaWZmLS1pdGVyYXRlLWh1bmtzCi0gICAgIG1heAotICAgICAobGFtYmRhIChi ZWcgZW5kKQotICAgICAgICh1bmxlc3MgKGdldC1jaGFyLXByb3BlcnR5IGJlZyAnZGlmZi0tZm9u dC1sb2NrLXJlZmluZWQpCi0gICAgICAgICAoZGlmZi0tcmVmaW5lLWh1bmsgYmVnIGVuZCkKLSAg ICAgICAgIChsZXQgKChvbCAobWFrZS1vdmVybGF5IGJlZyBlbmQpKSkKLSAgICAgICAgICAgKG92 ZXJsYXktcHV0IG9sICdkaWZmLS1mb250LWxvY2stcmVmaW5lZCB0KQotICAgICAgICAgICAob3Zl cmxheS1wdXQgb2wgJ2RpZmYtbW9kZSAnZmluZSkKLSAgICAgICAgICAgKG92ZXJsYXktcHV0IG9s ICdldmFwb3JhdGUgdCkKLSAgICAgICAgICAgKG92ZXJsYXktcHV0IG9sICdtb2RpZmljYXRpb24t aG9va3MKLSAgICAgICAgICAgICAgICAgICAgICAgICcoZGlmZi0tb3ZlcmxheS1hdXRvLWRlbGV0 ZSkpKSkpKSkpCisgICAgOzsgSWdub3JlIGVycm9ycyB0aGF0IGRpZmYgY2Fubm90IGJlIGZvdW5k IHNvIHRoYXQgY3VzdG9tIGZvbnQtbG9jaworICAgIDs7IGtleXdvcmRzIGFmdGVyIGBkaWZmLS1m b250LWxvY2stcmVmaW5lZCcgY2FuIHN0aWxsIGJlIGV2YWx1YXRlZC4KKyAgICAoaWdub3JlLWVy cm9yIGZpbGUtbWlzc2luZworICAgICAgKGRpZmYtLWl0ZXJhdGUtaHVua3MKKyAgICAgICBtYXgK KyAgICAgICAobGFtYmRhIChiZWcgZW5kKQorICAgICAgICAgKHVubGVzcyAoZ2V0LWNoYXItcHJv cGVydHkgYmVnICdkaWZmLS1mb250LWxvY2stcmVmaW5lZCkKKyAgICAgICAgICAgKGRpZmYtLXJl ZmluZS1odW5rIGJlZyBlbmQpCisgICAgICAgICAgIChsZXQgKChvbCAobWFrZS1vdmVybGF5IGJl ZyBlbmQpKSkKKyAgICAgICAgICAgICAob3ZlcmxheS1wdXQgb2wgJ2RpZmYtLWZvbnQtbG9jay1y ZWZpbmVkIHQpCisgICAgICAgICAgICAgKG92ZXJsYXktcHV0IG9sICdkaWZmLW1vZGUgJ2ZpbmUp CisgICAgICAgICAgICAgKG92ZXJsYXktcHV0IG9sICdldmFwb3JhdGUgdCkKKyAgICAgICAgICAg ICAob3ZlcmxheS1wdXQgb2wgJ21vZGlmaWNhdGlvbi1ob29rcworICAgICAgICAgICAgICAgICAg ICAgICAgICAnKGRpZmYtLW92ZXJsYXktYXV0by1kZWxldGUpKSkpKSkpKSkKIAogKGRlZnVuIGRp ZmYtLW92ZXJsYXktYXV0by1kZWxldGUgKG9sIF9hZnRlciBfYmVnIF9lbmQgJm9wdGlvbmFsIF9s ZW4pCiAgIChkZWxldGUtb3ZlcmxheSBvbCkpCi0tIAoyLjI1LjEKCg== --00000000000089e7a905c5753126 Content-Type: application/octet-stream; name="diff-trailing-ws.patch" Content-Disposition: attachment; filename="diff-trailing-ws.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kq9yg2p91 LS0tIHByZS50eHQJMjAyMS0wNi0yMyAxMzo0MDo0OC44NTA2NTkwODcgLTA3MDAKKysrIHBvc3Qu dHh0CTIwMjEtMDYtMjMgMTM6NDA6NTMuOTQyNTMzOTA3IC0wNzAwCkBAIC0xICsxIEBACi10ZXh0 Cit0ZXh0ICAK --00000000000089e7a905c5753126--