From unknown Wed Sep 10 01:58:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32474: 27.0.50; Gnus doesn't highlight refined changes in diff attachments Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Aug 2018 21:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32474 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 32474@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.153471537115298 (code B ref -1); Sun, 19 Aug 2018 21:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Aug 2018 21:49:31 +0000 Received: from localhost ([127.0.0.1]:54876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frVZj-0003ye-HO for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frVZg-0003yK-8J for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frVZa-000273-AU for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:45399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frVZa-00026s-7Q for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frVZZ-00022g-Bb for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frVZW-00025A-75 for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:21 -0400 Received: from homie-sub3.mail.dreamhost.com ([69.163.253.7]:46239 helo=homiemail-a22.g.dreamhost.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frVZW-00024t-0j for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:18 -0400 Received: from homiemail-a22.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a22.g.dreamhost.com (Postfix) with ESMTP id ED4A1114066 for ; Sun, 19 Aug 2018 14:49:16 -0700 (PDT) Received: from localhost.linkov.net (m91-129-110-6.cust.tele2.ee [91.129.110.6]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by homiemail-a22.g.dreamhost.com (Postfix) with ESMTPSA id C4E09114065 for ; Sun, 19 Aug 2018 14:49:14 -0700 (PDT) From: Juri Linkov Organization: LINKOV.NET Date: Mon, 20 Aug 2018 00:20:02 +0300 Message-ID: <87r2iuavvh.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) 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: -6.0 (------) --=-=-= Content-Type: text/plain Since refined changes in diff attachments are highlighted using overlays, they need special treatment to be copied together with text properties: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=gnus-mm-view.1.patch diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 50a927bce2..0b15f6b188 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -452,7 +452,7 @@ mm-display-inline-fontify "Insert HANDLE inline fontifying with MODE. If MODE is not set, try to find mode automatically." (let ((charset (mail-content-type-get (mm-handle-type handle) 'charset)) - text coding-system) + text coding-system ovs) (unless (eq charset 'gnus-decoded) (mm-with-unibyte-buffer (mm-insert-part handle) @@ -498,10 +498,18 @@ mm-display-inline-fontify (eq major-mode 'fundamental-mode)) (font-lock-ensure)))) (setq text (buffer-string)) + (when (eq mode 'diff-mode) + (setq ovs (mapcar (lambda (ov) (list ov (overlay-start ov) + (overlay-end ov))) + (overlays-in (point-min) (point-max))))) ;; Set buffer unmodified to avoid confirmation when killing the ;; buffer. (set-buffer-modified-p nil)) - (mm-insert-inline handle text))) + (let ((b (1- (point)))) + (mm-insert-inline handle text) + (dolist (ov ovs) + (move-overlay (nth 0 ov) (+ (nth 1 ov) b) + (+ (nth 2 ov) b) (current-buffer)))))) ;; Shouldn't these functions check whether the user even wants to use ;; font-lock? Also, it would be nice to change for the size of the --=-=-=-- From unknown Wed Sep 10 01:58:28 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Juri Linkov Subject: bug#32474: closed (Re: bug#32474: 27.0.50; Gnus doesn't highlight refined changes in diff attachments) Message-ID: References: <87tvnb33f9.fsf@mail.linkov.net> <87r2iuavvh.fsf@mail.linkov.net> X-Gnu-PR-Message: they-closed 32474 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 32474@debbugs.gnu.org Date: Thu, 30 Aug 2018 22:18:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1535667482-24499-1" This is a multi-part message in MIME format... ------------=_1535667482-24499-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32474: 27.0.50; Gnus doesn't highlight refined changes in diff attachments which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32474@debbugs.gnu.org. --=20 32474: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32474 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1535667482-24499-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32474-done) by debbugs.gnu.org; 30 Aug 2018 22:17:38 +0000 Received: from localhost ([127.0.0.1]:39547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvVFy-0006MY-DK for submit@debbugs.gnu.org; Thu, 30 Aug 2018 18:17:38 -0400 Received: from pop.dreamhost.com ([64.90.62.162]:38642 helo=pdx1-sub0-mail-a11.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvVFw-0006MO-7T for 32474-done@debbugs.gnu.org; Thu, 30 Aug 2018 18:17:36 -0400 Received: from pdx1-sub0-mail-a11.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a11.g.dreamhost.com (Postfix) with ESMTP id 3EF407FF10 for <32474-done@debbugs.gnu.org>; Thu, 30 Aug 2018 15:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=he1QyV1sogckNGxA2OvG3DaOsaw=; b= Zl0T85QXd76OF+152z6fkMA/efnyomJNxIq7wm6xnj8H+U0rSrozbKgIa1KcytaS n8VOflEOKDTFhRSIgxYVZRgOCVl/V1lyOqLwO/mMPrRBz6WZ9HE7we98r3umQp9w 1w1S8iaVlXiJStPJx9qx/2cpPRbRs/JtS2VyU8DId9U= Received: from localhost.linkov.net (m91-129-99-146.cust.tele2.ee [91.129.99.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a11.g.dreamhost.com (Postfix) with ESMTPSA id 82A787FF0C for <32474-done@debbugs.gnu.org>; Thu, 30 Aug 2018 15:17:34 -0700 (PDT) From: Juri Linkov To: 32474-done@debbugs.gnu.org Subject: Re: bug#32474: 27.0.50; Gnus doesn't highlight refined changes in diff attachments Organization: LINKOV.NET References: <87r2iuavvh.fsf@mail.linkov.net> Date: Fri, 31 Aug 2018 01:17:14 +0300 In-Reply-To: <87r2iuavvh.fsf@mail.linkov.net> (Juri Linkov's message of "Mon, 20 Aug 2018 00:20:02 +0300") Message-ID: <87tvnb33f9.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32474-done 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: -1.0 (-) > Since refined changes in diff attachments are highlighted using overlays, > they need special treatment to be copied together with text properties: Done in eb5588db69. ------------=_1535667482-24499-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 19 Aug 2018 21:49:31 +0000 Received: from localhost ([127.0.0.1]:54876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frVZj-0003ye-HO for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frVZg-0003yK-8J for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frVZa-000273-AU for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:45399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frVZa-00026s-7Q for submit@debbugs.gnu.org; Sun, 19 Aug 2018 17:49:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frVZZ-00022g-Bb for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frVZW-00025A-75 for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:21 -0400 Received: from homie-sub3.mail.dreamhost.com ([69.163.253.7]:46239 helo=homiemail-a22.g.dreamhost.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frVZW-00024t-0j for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2018 17:49:18 -0400 Received: from homiemail-a22.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a22.g.dreamhost.com (Postfix) with ESMTP id ED4A1114066 for ; Sun, 19 Aug 2018 14:49:16 -0700 (PDT) Received: from localhost.linkov.net (m91-129-110-6.cust.tele2.ee [91.129.110.6]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by homiemail-a22.g.dreamhost.com (Postfix) with ESMTPSA id C4E09114065 for ; Sun, 19 Aug 2018 14:49:14 -0700 (PDT) From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: 27.0.50; Gnus doesn't highlight refined changes in diff attachments Organization: LINKOV.NET Date: Mon, 20 Aug 2018 00:20:02 +0300 Message-ID: <87r2iuavvh.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit 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: -6.0 (------) --=-=-= Content-Type: text/plain Since refined changes in diff attachments are highlighted using overlays, they need special treatment to be copied together with text properties: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=gnus-mm-view.1.patch diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 50a927bce2..0b15f6b188 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -452,7 +452,7 @@ mm-display-inline-fontify "Insert HANDLE inline fontifying with MODE. If MODE is not set, try to find mode automatically." (let ((charset (mail-content-type-get (mm-handle-type handle) 'charset)) - text coding-system) + text coding-system ovs) (unless (eq charset 'gnus-decoded) (mm-with-unibyte-buffer (mm-insert-part handle) @@ -498,10 +498,18 @@ mm-display-inline-fontify (eq major-mode 'fundamental-mode)) (font-lock-ensure)))) (setq text (buffer-string)) + (when (eq mode 'diff-mode) + (setq ovs (mapcar (lambda (ov) (list ov (overlay-start ov) + (overlay-end ov))) + (overlays-in (point-min) (point-max))))) ;; Set buffer unmodified to avoid confirmation when killing the ;; buffer. (set-buffer-modified-p nil)) - (mm-insert-inline handle text))) + (let ((b (1- (point)))) + (mm-insert-inline handle text) + (dolist (ov ovs) + (move-overlay (nth 0 ov) (+ (nth 1 ov) b) + (+ (nth 2 ov) b) (current-buffer)))))) ;; Shouldn't these functions check whether the user even wants to use ;; font-lock? Also, it would be nice to change for the size of the --=-=-=-- ------------=_1535667482-24499-1--