From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: master 78fc49407b8 1/3: Improve filling of ChangeLog entries Date: Tue, 30 Jan 2024 22:07:18 +0000 Message-ID: <8734ue327d.fsf@gmail.com> References: <170643232559.30479.16631610453249222615@vcs2.savannah.gnu.org> <20240128085846.187A2C1DAE4@vcs2.savannah.gnu.org> <540cc339-b7d4-4c1a-b084-c7f739ad4947@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36707"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Jan 31 04:22:43 2024 Return-path: Envelope-to: ged-emacs-devel@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 1rV1BR-0009FQ-NU for ged-emacs-devel@m.gmane-mx.org; Wed, 31 Jan 2024 04:22:41 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rV1Ah-0003zr-CS; Tue, 30 Jan 2024 22:21:55 -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 1rUwGE-0003N9-OD for emacs-devel@gnu.org; Tue, 30 Jan 2024 17:07:18 -0500 Original-Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rUwGD-00081U-4E for emacs-devel@gnu.org; Tue, 30 Jan 2024 17:07:18 -0500 Original-Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-33aeb088324so1911098f8f.2 for ; Tue, 30 Jan 2024 14:07:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706652434; x=1707257234; darn=gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2zsjh5LxBxRLrWz2bOapUep5ngwLINhAFPSx+TEryGM=; b=iIzYHaRLbECG0VhwRGA4vO9MCn9FX8RDvbBHaKyZ/x8W/OZg15r5s6kPpSEUfdetiK gBdPk1Y3pfwvxrh6v5r0p37Z4VBkNf7WXcBa4MGjIaQaC2UcnUcuqx4OlTPPGZX58/HY N1qyCdD+baPW9PZ+wkdxTkB00KiBhk1Qd+3CPBOMTgBrxZLhIuISpwadEiG4+8G2wMyV N+guI4FjHn7vv73f/JQlRlxtuLLbJPlNYWOZ9cIbxrzWRcsvibKlTzkcK9NxphHoCk6+ Ki4QpPhDW6QUOrV75DdJFjxm3gCwFEcsi+loUUSlW4w9lBSKriouoHc92FhGLQ77p6KZ 098w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706652434; x=1707257234; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2zsjh5LxBxRLrWz2bOapUep5ngwLINhAFPSx+TEryGM=; b=PJXAe0HuoF0zFHfIGKV0/FaS9/rlNDI5ZFbn+lJil0lFo55YOriM6ewO0Oyse6dbCJ rVs+LVuBWJYbq6GGteutvIrNSJNtJ9jW3GB3lcLDKC3fHoplqAfKBAL4a6kzAid4kyDS IqmkfGLPdHbkDR92VO/8at05JOENi4eB1XR9wssiZ3bYIQrM28LaXiLE+7FfOu7iP2px +Q/aMvCp8DvcbdtIL7o84GoqsulJ7EkjsY2KhQ6zbaPr7Z60HPEMvIsY/UmeE2IkdqGj fRqg6te33fwPBsiId5Oin3QsaTxA1uA+anaX8/HQbwM1hgTKpNhRFAZ7SwyeT0TP6b2o S8WQ== X-Gm-Message-State: AOJu0YySeUPXpgMHR1c6uJW5kZrvCmbDJDHtbI8YCs6RwaQeEBDpsQ/C OgSYPYqw3yuMUKIxuUv1tN/KEcKFq1kvHFlw+skP3mSGDQHMvwBXnJajJ+ZG X-Google-Smtp-Source: AGHT+IGxIIP/1PlsvbcAfuykckY9Y+fgyX3rs6HmeC38EDc/gfLRvGX4ldTKPVwLUkvKOU1SbxZMJQ== X-Received: by 2002:a05:6000:2ac:b0:33a:f521:5815 with SMTP id l12-20020a05600002ac00b0033af5215815mr4480912wry.26.1706652434089; Tue, 30 Jan 2024 14:07:14 -0800 (PST) Original-Received: from krug ([87.196.75.187]) by smtp.gmail.com with ESMTPSA id h4-20020adfa4c4000000b00337d4eed87asm11808691wrb.115.2024.01.30.14.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 14:07:13 -0800 (PST) In-Reply-To: <540cc339-b7d4-4c1a-b084-c7f739ad4947@gutov.dev> (Dmitry Gutov's message of "Sun, 28 Jan 2024 15:22:59 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=joaotavora@gmail.com; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 30 Jan 2024 22:21:54 -0500 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:315649 Archived-At: Dmitry Gutov writes: > On 28/01/2024 10:58, Po Lu via Mailing list for Emacs changes wrote: >> (log-edit-fill-entry): Abandon pcase and cl-lib. > > That seems like a gratuitous change. Seems like this much simpler patch would have done the job. If cl-loop is so toxic, even macroexpanding these trivial ones away yields much less code and much simpler code. Tests are a welcome addition though. Jo=C3=A3o diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 72867f14d2f..0ce21c5c473 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -578,15 +578,17 @@ log-edit--insert-filled-defuns (unless (or (memq (char-before) '(?\n ?\s)) (> (current-column) fill-column)) (insert " ")) - (cl-loop for first-fun =3D t then nil - for def in func-names do - (when (> (+ (current-column) (string-width def)) fill-column) - (unless first-fun - (insert ")")) - (insert "\n")) - (insert (if (memq (char-before) '(?\n ?\s)) - "(" ", ") - def)) + (cl-loop with first-fun =3D t + for (def . more) on func-names do + (when (> (+ (current-column) (string-width def) + (if first-fun 1 2) + (if (null more) 1 0)) + fill-column) + (unless first-fun (insert ")")) + (unless (eq (char-before) ?\n) (insert "\n")) + (setq first-fun t)) + (insert (if first-fun "(" ", ") def) + (setq first-fun nil)) (insert "):"))) =20 (defun log-edit-fill-entry (&optional justify) @@ -611,10 +613,11 @@ log-edit-fill-entry (copy-marker (match-end 1))) ;; Fill prose between log entries. do (let ((fill-indent-according-to-mode t) - (end (if defuns-beg (match-beginning 0) end)) - (beg (progn (goto-char beg) (line-beginning-position)))) + (end (if defuns-beg (match-beginning 0) end))) + (goto-char beg) + (skip-chars-backward "^ \t\n") (when (<=3D (line-end-position) end) - (fill-region beg end justify))) + (fill-region (point) end justify))) while defuns-beg for defuns =3D (progn (goto-char defuns-beg) (change-log-read-defuns end))