From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#23843: [PATCH 3/3] =?UTF-8?Q?Don=E2=80=99t?= create unnecessary marker in =?UTF-8?Q?=E2=80=98delete-trailing-whitespace=E2=80=99?= Date: Sat, 25 Jun 2016 00:14:45 +0200 Message-ID: <1466806485-15732-3-git-send-email-mina86@mina86.com> References: <1466806485-15732-1-git-send-email-mina86@mina86.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1466806541 29265 80.91.229.3 (24 Jun 2016 22:15:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 24 Jun 2016 22:15:41 +0000 (UTC) To: 23843@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 25 00:15:26 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1bGZNd-0006eV-So for geb-bug-gnu-emacs@m.gmane.org; Sat, 25 Jun 2016 00:15:18 +0200 Original-Received: from localhost ([::1]:47493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGZNd-0003Uc-6k for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Jun 2016 18:15:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGZNT-0003Qh-H7 for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2016 18:15:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGZNP-00010h-4W for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2016 18:15:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:42367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGZNP-00010T-00 for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2016 18:15:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bGZNO-0000ui-LZ for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2016 18:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Jun 2016 22:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23843 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 23843-submit@debbugs.gnu.org id=B23843.14668065003472 (code B ref 23843); Fri, 24 Jun 2016 22:15:02 +0000 Original-Received: (at 23843) by debbugs.gnu.org; 24 Jun 2016 22:15:00 +0000 Original-Received: from localhost ([127.0.0.1]:54702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bGZNL-0000tw-Q2 for submit@debbugs.gnu.org; Fri, 24 Jun 2016 18:14:59 -0400 Original-Received: from mail-wm0-f45.google.com ([74.125.82.45]:34868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bGZNJ-0000tL-4j for 23843@debbugs.gnu.org; Fri, 24 Jun 2016 18:14:57 -0400 Original-Received: by mail-wm0-f45.google.com with SMTP id v199so36958153wmv.0 for <23843@debbugs.gnu.org>; Fri, 24 Jun 2016 15:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=noWIe0MtbTq5gBJaDw2SZnBP7wZV8IO2dZTIwClFytg=; b=mEXS58SJHr5lYyMRImwjUyqy0sFJROR9flBQ5OxnPr+atE7ehVJ9jWeQkp0VxP15RT D9TXv25RvbIO+rcjU5zor/DoaO0+G4z0DWKC1Tf3FqLF7jyqr3/NBBEKUGN/sbe50TP8 S2N/UjI7qwf46JBdSLVUwPS1weKKlyKPt3Cri3nEXtB59+87+qfFczXK2uSOP1mVj4Zy h7cP24io2Q8RWmLn2tYOiiZERqftIuck71kb+QBlmKHZpb3gfkWNAKrqFy4R0XI5Eghf RaEgauoqtbVo9uRjaPyBTS2FPKC+qWlVsqKBv1rARM6zww/ZyLws+iNtNFjEZdb+xEyL M2OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=noWIe0MtbTq5gBJaDw2SZnBP7wZV8IO2dZTIwClFytg=; b=D2S1eFGexIa4UutEmBUs3tRjR00fJYnMi6Hav/WKJEe0l/4Y6cXvTMMv6vkZDDS01z +XUJnK5pDfx5GzF0tSggIiCKy2ciWZm8004kQf5KWaobM72xSO8KENL7GHTwQBNzNEg3 eXhU5+QlErB0npCFbSiV48tUjSW0U7XvimSEQZi7w3BmmsTU06E1NVsSsaFo0rHniX+i FRqAjG2GLPLBuxFcyE/nIRU2B3G5aBddzmT+3tLeQ7RZZ8CrZWhRmjEIEoE8K6x47cTR P6wErICIjK+eJH/jpaVa6t2uNN4Cti9l8MKhLoED1p2MW0DochtBE/43h4yhWNYjCCFT bNmg== X-Gm-Message-State: ALyK8tLZohsLWUUu8SJr3zBAb9y2TBTz1LkQZkffCDdLaSDyJ6+g+n+rsH6kQxthndTMBJCd X-Received: by 10.28.10.66 with SMTP id 63mr298108wmk.54.1466806491482; Fri, 24 Jun 2016 15:14:51 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([2620:0:105f:301:b4f3:1658:396c:104e]) by smtp.gmail.com with ESMTPSA id ag3sm1252358wjc.39.2016.06.24.15.14.47 for <23843@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jun 2016 15:14:49 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id 4F5D91E028A; Sat, 25 Jun 2016 00:14:47 +0200 (CEST) X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1466806485-15732-1-git-send-email-mina86@mina86.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:120020 Archived-At: * lisp/simple.el (delete-trailing-whitespace): If END argument is nil, there is no need for the end-marker to be created. --- lisp/simple.el | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index fbeef9d..6e440fc 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -602,7 +602,7 @@ delete-trailing-whitespace (list nil nil)))) (save-match-data (save-excursion - (let ((end-marker (copy-marker (or end (point-max))))) + (let ((end-marker (and end (copy-marker end)))) (goto-char (or start (point-min))) (with-syntax-table (make-syntax-table (syntax-table)) ;; Don't delete formfeeds, even if they are considered whitespace. @@ -611,15 +611,14 @@ delete-trailing-whitespace (modify-syntax-entry ?\n "_") (while (re-search-forward "\\s-+$" end-marker t) (delete-region (match-beginning 0) (match-end 0)))) - ;; Delete trailing empty lines. - (goto-char end-marker) - (when (and (not end) - delete-trailing-lines - ;; Really the end of buffer. - (= (point-max) (1+ (buffer-size))) - (<= (skip-chars-backward "\n") -2)) - (delete-region (1+ (point)) end-marker)) - (set-marker end-marker nil)))) + (if end + (set-marker end-marker nil) + ;; Delete trailing empty lines. + (and delete-trailing-lines + ;; Really the end of buffer. + (= (goto-char (point-max)) (1+ (buffer-size))) + (<= (skip-chars-backward "\n") -2) + (delete-region (1+ (point)) (point-max))))))) ;; Return nil for the benefit of `write-file-functions'. nil) -- 2.8.0.rc3.226.g39d4020