From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#60187: [PATCH] whitespace: Clear bob and eob markers in `whitespace-color-off' Date: Wed, 10 Jan 2024 14:36:16 -0800 Message-ID: References: <28c4b5f7-79ab-c87d-889a-96e0c7390b95@rhansen.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23298"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60187@debbugs.gnu.org To: Richard Hansen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 10 23:37:17 2024 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 1rNhCH-0005p8-12 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Jan 2024 23:37:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNhC9-0002SN-DU; Wed, 10 Jan 2024 17:37:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNhC3-0002RD-N3 for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2024 17:37:05 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNhC3-000637-2B for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2024 17:37:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNhC1-0002Sr-SB for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2024 17:37:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Jan 2024 22:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60187 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 60187-submit@debbugs.gnu.org id=B60187.17049261849411 (code B ref 60187); Wed, 10 Jan 2024 22:37:01 +0000 Original-Received: (at 60187) by debbugs.gnu.org; 10 Jan 2024 22:36:24 +0000 Original-Received: from localhost ([127.0.0.1]:43493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNhBP-0002Rj-Fn for submit@debbugs.gnu.org; Wed, 10 Jan 2024 17:36:23 -0500 Original-Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:45562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNhBN-0002RW-CP for 60187@debbugs.gnu.org; Wed, 10 Jan 2024 17:36:21 -0500 Original-Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5588a83e0d0so192328a12.3 for <60187@debbugs.gnu.org>; Wed, 10 Jan 2024 14:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704926176; x=1705530976; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=I8n4Pt+myEq8q8o5UJL2e7tQhXfsDz6rW314koYLS2E=; b=fB9OZSbX5MPCLvWE9Sd3jBUWJUGk6WcVyqKvmuxNVaZL3aPimy4OkfbZUdCZvJUpuX F6+KxhC23O+sgu9Ozkzp6DTaCjP163ti90XA5Nzu9hDWbV3gjc1rseHcrFGPM9v3wChk TW1AlDu3Ptxbdgn7U9buwBrXuix/nLB2o5gAz9VDzoJwdF9bPjvcRG6S4NE+HL8edQr6 szCcc/Mt/q/6mZGESmE6jZlu7wBS+DKSea/m+qVmTvbxGELNqmAGSTLFdQKbTK7jzjwP XVVT0QVXuaIIX8mxSTsBWGlDYKabY1RuSTbz3lhiFccvQt2H9IW8x58ts/D4Kf2w8bVa ieXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704926176; x=1705530976; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I8n4Pt+myEq8q8o5UJL2e7tQhXfsDz6rW314koYLS2E=; b=rIufTBThjGxRKvY+MbTU+PZw5iwo2Mv0/5iKh2js6w/14FymT4LBpzCP0pdw15T5Qn R7bwUscsJf6N534u17jzcIyIHSXOeaBETb3qR8zuJAiY0egQvbohIQn7uHae5SGLZIJc wsuEMBhTQhSaoORS29iCoCXcJsB83t7LxsdqTkuRM4a/dQwJBjitC0ZI3fDq2ymPG4zB xgPUS04d0JUzL8p89QfEI9k11yf7WI5O9ARUlOSJpFMGBGGz2oACN40osyHoGqEM3tNW ELj30a7BIv5XXgfAv2w+mZt8F5UqPz5QTNNXaWs6864k58riJ8z6O/rvaZxUy+tilIge W2sw== X-Gm-Message-State: AOJu0YyHzxNXO/aOHaWoV2Y8/MVFDeQ3B2el8ied1zmaVZEiCqMmK2lA AcoqF5ml/kVmE+jeJFxMFaieB+LI/M8+ezjfJKTUQ1PGfm1UOA== X-Google-Smtp-Source: AGHT+IG97r42yqJdwBITw/rKndXUdGMJ+UdG/r5SyjPTRfdYq9CgO/fUtF72V7q2ygFz4bWs/ncBzh2LPXWNkgdQe8o= X-Received: by 2002:a05:6402:326:b0:557:7f96:1d12 with SMTP id q6-20020a056402032600b005577f961d12mr71382edw.44.1704926176564; Wed, 10 Jan 2024 14:36:16 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 10 Jan 2024 14:36:16 -0800 In-Reply-To: <28c4b5f7-79ab-c87d-889a-96e0c7390b95@rhansen.org> (Richard Hansen's message of "Mon, 19 Dec 2022 00:03:39 -0500") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:277842 Archived-At: Richard Hansen writes: > See attached. Thanks for the patch and apologies for taking so long to reply. Does this fix any particular issue or is this just a cleanup? > From 225dc1f32c865a3b36eb9c6d3881b298c871e3a3 Mon Sep 17 00:00:00 2001 > From: Richard Hansen > Date: Wed, 14 Dec 2022 01:57:17 -0500 > Subject: [PATCH] whitespace: Clear bob and eob markers in > `whitespace-color-off' > > * lisp/whitespace.el (whitespace-color-off): Clear markers when > turning off `whitespace-mode'. > * test/lisp/whitespace-tests.el (whitespace-tests--clear-markers): Add > a test. > --- > lisp/whitespace.el | 4 +++- > test/lisp/whitespace-tests.el | 6 ++++++ > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/lisp/whitespace.el b/lisp/whitespace.el > index 558be1841a..b747293eb4 100644 > --- a/lisp/whitespace.el > +++ b/lisp/whitespace.el > @@ -2220,7 +2220,9 @@ whitespace-color-off > (remove-hook 'clone-buffer-hook #'whitespace--clone t) > (remove-hook 'clone-indirect-buffer-hook #'whitespace--clone t) > (font-lock-remove-keywords nil whitespace-font-lock-keywords) > - (font-lock-flush))) > + (font-lock-flush) > + (set-marker whitespace-bob-marker nil) > + (set-marker whitespace-eob-marker nil))) > > (defun whitespace-point--used (start end) > (let ((ostart (overlay-start whitespace-point--used))) > diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el > index 7079c1ea5e..1780d6246d 100644 > --- a/test/lisp/whitespace-tests.el > +++ b/test/lisp/whitespace-tests.el > @@ -64,6 +64,12 @@ whitespace-tests--cleanup-string > (whitespace-cleanup) > (buffer-string))) > > +(ert-deftest whitespace-tests--clear-markers () > + (whitespace-tests--with-test-buffer '(face empty) > + (whitespace-mode -1) > + (should (null (marker-buffer whitespace-bob-marker))) > + (should (null (marker-buffer whitespace-eob-marker))))) > + > (ert-deftest whitespace-cleanup-eob () > (let ((whitespace-style '(empty))) > (should (equal (whitespace-tests--cleanup-string "a\n")