From unknown Tue Jun 17 22:26:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#49197: [PATCH] 28.0.50; Inability to find "diff" prevents `font-lock-add-keywords' from working in `diff-mode' 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 To: 49197@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162448202421333 (code B ref -1); Wed, 23 Jun 2021 21:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 21:00:24 +0000 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 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 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 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 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) MIME-Version: 1.0 From: Jim Porter Date: Wed, 23 Jun 2021 14:00:05 -0700 Message-ID: Content-Type: multipart/mixed; boundary="00000000000089e7a905c5753126" 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --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-- From unknown Tue Jun 17 22:26:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#49197: [PATCH] 28.0.50; Inability to find "diff" prevents `font-lock-add-keywords' from working in `diff-mode' Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Jun 2021 16:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49197 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 49197@debbugs.gnu.org Received: via spool by 49197-submit@debbugs.gnu.org id=B49197.162455088631844 (code B ref 49197); Thu, 24 Jun 2021 16:09:01 +0000 Received: (at 49197) by debbugs.gnu.org; 24 Jun 2021 16:08:06 +0000 Received: from localhost ([127.0.0.1]:43895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwRte-0008HY-DX for submit@debbugs.gnu.org; Thu, 24 Jun 2021 12:08:06 -0400 Received: from quimby.gnus.org ([95.216.78.240]:33556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwRtc-0008Gy-O2 for 49197@debbugs.gnu.org; Thu, 24 Jun 2021 12:08:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TY8b1qZCGkHp7iDfVi6AN8dkIbvw3abNzLeLA8Ck7hs=; b=M6Zolw9b+S2OfyQbZfEIcBDOfP 7lV17fsu7XmM04GjtggXhu3Th/65H9tWZgZLXuX4WNojue4XVv2VBXv/aoKioDfbiSca/pM5ssZ/p OZ0kTd+0ctMjaB9NJu7zCIRWcRgwlCskfImYmjkG+PAAELfRbF0gqHc6n823BhFrpRgg=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwRtU-00027w-PK; Thu, 24 Jun 2021 18:07:59 +0200 From: Lars Ingebrigtsen References: X-Now-Playing: Arthur Russell's _The Fruit of the Original Sin_: "Sketch for 'Face of Helen'" Date: Thu, 24 Jun 2021 18:07:54 +0200 In-Reply-To: (Jim Porter's message of "Wed, 23 Jun 2021 14:00:05 -0700") Message-ID: <87r1gri6ud.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > 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. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > 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. Makes sense to me. Pushed to Emacs 28 now. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 24 12:08:10 2021 Received: (at control) by debbugs.gnu.org; 24 Jun 2021 16:08:10 +0000 Received: from localhost ([127.0.0.1]:43898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwRti-0008Hr-Jv for submit@debbugs.gnu.org; Thu, 24 Jun 2021 12:08:10 -0400 Received: from quimby.gnus.org ([95.216.78.240]:33572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwRth-0008HO-3r for control@debbugs.gnu.org; Thu, 24 Jun 2021 12:08:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=moRR78zW58hW2u4DDWFsp2tGfdW7jcHEqnjRjzbZ9sE=; b=Sd4b6CjYOJsDMLjEZNLtN5Ge5F YftTIljul3Hu01EgS0aty43r0TjGUywMtK/C3+bKrSt0XzkRpT7+zgHv5Tjq9WLEhgAYoIHfpuhYQ MNhAKJHXAbR3ecc0xSea2vU0a3iEd2vsoX+OrGGZ1qwp8aLI+0xR4j0aXHJCmS2X0PUo=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwRtZ-000285-Pn for control@debbugs.gnu.org; Thu, 24 Jun 2021 18:08:03 +0200 Date: Thu, 24 Jun 2021 18:08:01 +0200 Message-Id: <87pmwbi6u6.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #49197 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 49197 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 49197 28.1 quit