From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.bugs Subject: bug#24675: 26.0.50; Misleading suggestion in Ediff Info manual Date: Sun, 18 Dec 2016 21:25:41 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1148d9fe941fda0543f57229 X-Trace: blaine.gmane.org 1482096377 1313 195.159.176.226 (18 Dec 2016 21:26:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 18 Dec 2016 21:26:17 +0000 (UTC) Cc: 24675@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 18 22:26:13 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIiy8-0007VD-Sl for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 Dec 2016 22:26:09 +0100 Original-Received: from localhost ([::1]:42243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIiyD-0002Rb-F1 for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 Dec 2016 16:26:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIiy7-0002RW-Ak for bug-gnu-emacs@gnu.org; Sun, 18 Dec 2016 16:26:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIiy2-000265-Gq for bug-gnu-emacs@gnu.org; Sun, 18 Dec 2016 16:26:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:59315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cIiy2-00025z-Dd for bug-gnu-emacs@gnu.org; Sun, 18 Dec 2016 16:26:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cIiy2-0000Fq-5B for bug-gnu-emacs@gnu.org; Sun, 18 Dec 2016 16:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Dec 2016 21:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24675 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 24675-submit@debbugs.gnu.org id=B24675.1482096361975 (code B ref 24675); Sun, 18 Dec 2016 21:26:02 +0000 Original-Received: (at 24675) by debbugs.gnu.org; 18 Dec 2016 21:26:01 +0000 Original-Received: from localhost ([127.0.0.1]:46481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIiy1-0000Fb-6j for submit@debbugs.gnu.org; Sun, 18 Dec 2016 16:26:01 -0500 Original-Received: from mail-wm0-f48.google.com ([74.125.82.48]:38057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cIixx-0000FM-Ii for 24675@debbugs.gnu.org; Sun, 18 Dec 2016 16:25:58 -0500 Original-Received: by mail-wm0-f48.google.com with SMTP id f82so85268410wmf.1 for <24675@debbugs.gnu.org>; Sun, 18 Dec 2016 13:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+SRu1GBZIp+/0b1CYeuBNrPHcjhqjxFcF3TGZV2mxHA=; b=Ik0bQUrqjBATBZAltwPVdzg7U/8B5BO5KB4f6OwerSDGzcG153YHJkvFRZpzvHO5JE fizlQIAIgVu4UHsghp9nrzfxPVHdqNMXOqTghX7AEmT8VD2BgdgAhJJd7MqJeASxoekc CBBE34aTxwYmaCPsZpGiL6a9GJGeOQJY3PEsWuUq0NwZx0RBMrwc9tkuM14GEhkz/Wyk FDLO4AReZnKc8MG0TPQz5qmDoUctI1v5bweVYlJs+rvW2uSEPRfbjcbrRfDuzrlmbq3M PTQQv1FxsMBg/qm7HHzh5kxkAIaaiyHWcqAL8xJis+jVo4CkLahkdYpeX4XsjYawLAl7 M0DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+SRu1GBZIp+/0b1CYeuBNrPHcjhqjxFcF3TGZV2mxHA=; b=UiZk3MnyelxBEXryXZR1saiBTskOoPJ02XZ5p81MOl3OPH4ZgPm8l3X6WFQN5mfkrn gMcMFwCYkgm88yr+JLkMmWkaxq2FnAswV/R+yDiWONblBSRNJSXBjZLgGL/8CCTSAk9l vqvumwosjAoRjQ2C68qOB3WjqBSssMqinh5SvyuTRss3OoRMUjZnnzGbeLDKRjzGO3x/ Tum3D+FyXaUZjPSQwz4wJaNa1AYD6AAAslrVQlsNPkOYePf83SbypGp4I+cDabQfRR03 +4qCaQ/gmh2y6l/xO7HNS1A82Hfjvzg2mAx5CEwfm4CPKwky8LShUyDfP65o/+idDetR gOfA== X-Gm-Message-State: AIkVDXKBFjKYEHrRdmS0aCQ0/N+sr52a3RVANDy6u2eVxvBBtgoIUAWX/gq5a84H0h96QyEeIRRR6eCJKj4H/A== X-Received: by 10.28.195.9 with SMTP id t9mr10242016wmf.92.1482096351902; Sun, 18 Dec 2016 13:25:51 -0800 (PST) In-Reply-To: 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:127143 Archived-At: --001a1148d9fe941fda0543f57229 Content-Type: multipart/alternative; boundary=001a1148d9fe941fd50543f57227 --001a1148d9fe941fd50543f57227 Content-Type: text/plain; charset=UTF-8 Glenn Morris schrieb am Di., 13. Dez. 2016 um 19:03 Uhr: > Philipp Stephani wrote: > > > The Ediff Info manual, in section 7.1 "Hooks", says: > > > > 'ediff-cleanup-hook' > > This hook is run just before 'ediff-quit-hook'. This is a good > > place to do various cleanups, such as deleting the variant buffers. > > Ediff provides a function, 'ediff-janitor', as one such possible > > hook, which you can add to 'ediff-cleanup-hook' with 'add-hook'. > > > > However, ediff-cleanup-hook is a normal hook, and ediff-janitor is a > > function taking two required arguments, so it cannot be added to > > ediff-cleanup-hook. The manual should e.g. state that a lambda wrapping > > ediff-janitor can be added to ediff-cleanup-hook, but not ediff-janitor > > itself. > > It seems the doc hasn't been updated in the past 14 years. > Before 50a07e1, there was a single optional argument. > You might be one of the few users of this functionality, so maybe you > would like to fix the doc yourself? I don't use it myself, but I got a report from a colleague who interpreted the manual such that you could add ediff-janitor directly to the hook with add-hook. I've attached a patch to clarify this. I'll push it to emacs-25 in a few days until there are complaints. --001a1148d9fe941fd50543f57227 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


Glenn = Morris <rgm@gnu.org> schrieb am Di= ., 13. Dez. 2016 um 19:03=C2=A0Uhr:
Philipp Stephani wrote:

> The Ediff Info manual, in section 7.1 "Hooks", says:
>
> 'ediff-cleanup-hook'
>=C2=A0 =C2=A0 =C2=A0 This hook is run just before 'ediff-quit-hook&= #39;.=C2=A0 This is a good
>=C2=A0 =C2=A0 =C2=A0 place to do various cleanups, such as deleting the= variant buffers.
>=C2=A0 =C2=A0 =C2=A0 Ediff provides a function, 'ediff-janitor'= , as one such possible
>=C2=A0 =C2=A0 =C2=A0 hook, which you can add to 'ediff-cleanup-hook= ' with 'add-hook'.
>
> However, ediff-cleanup-hook is a normal hook, and ediff-janitor is a > function taking two required arguments, so it cannot be added to
> ediff-cleanup-hook.=C2=A0 The manual should e.g. state that a lambda w= rapping
> ediff-janitor can be added to ediff-cleanup-hook, but not ediff-janito= r
> itself.

It seems the doc hasn't been updated in the past 14 years.
Before 50a07e1, there was a single optional argument.
You might be one of the few users of this functionality, so maybe you
would like to fix the doc yourself?

I don&= #39;t use it myself, but I got a report from a colleague who interpreted th= e manual such that you could add ediff-janitor directly to the hook with ad= d-hook. I've attached a patch to clarify this. I'll push it to emac= s-25 in a few days until there are complaints.=C2=A0
--001a1148d9fe941fd50543f57227-- --001a1148d9fe941fda0543f57229 Content-Type: text/plain; charset=US-ASCII; name="0001-Clarify-usage-of-ediff-cleanup-hook-Bug-24675.txt" Content-Disposition: attachment; filename="0001-Clarify-usage-of-ediff-cleanup-hook-Bug-24675.txt" Content-Transfer-Encoding: base64 Content-ID: <15913d2f37e8c9f7d301> X-Attachment-Id: 15913d2f37e8c9f7d301 RnJvbSAyODU1NmFiMTg3OWQ1NDUzNDM2M2Y1Y2I0Y2M5Njc4ZjAxNGVmY2M1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwIFN0ZXBoYW5pIDxwaHN0QGdvb2dsZS5jb20+CkRh dGU6IFN1biwgMTggRGVjIDIwMTYgMjI6MTg6MDEgKzAxMDAKU3ViamVjdDogW1BBVENIXSBDbGFy aWZ5IHVzYWdlIG9mICdlZGlmZi1jbGVhbnVwLWhvb2snIChCdWcjMjQ2NzUpCgoqIGRvYy9taXNj L2VkaWZmLnRleGkgKEhvb2tzKTogQ2xhcmlmeSB1c2FnZSBvZiAnZWRpZmYtY2xlYW51cC1ob29r JwotLS0KIGRvYy9taXNjL2VkaWZmLnRleGkgfCAxMSArKysrKysrKy0tLQogMSBmaWxlIGNoYW5n ZWQsIDggaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2MvbWlz Yy9lZGlmZi50ZXhpIGIvZG9jL21pc2MvZWRpZmYudGV4aQppbmRleCAzNzZhYWVlLi44OTZhNjA0 IDEwMDY0NAotLS0gYS9kb2MvbWlzYy9lZGlmZi50ZXhpCisrKyBiL2RvYy9taXNjL2VkaWZmLnRl eGkKQEAgLTEyNDcsOSArMTI0NywxNCBAQCBIb29rcwogQHZpbmRleCBlZGlmZi1jbGVhbnVwLWhv b2sKIFRoaXMgaG9vayBpcyBydW4ganVzdCBiZWZvcmUgQGNvZGV7ZWRpZmYtcXVpdC1ob29rfS4g IFRoaXMgaXMgYSBnb29kCiBwbGFjZSB0byBkbyB2YXJpb3VzIGNsZWFudXBzLCBzdWNoIGFzIGRl bGV0aW5nIHRoZSB2YXJpYW50IGJ1ZmZlcnMuCi1FZGlmZiBwcm92aWRlcyBhIGZ1bmN0aW9uLCBA Y29kZXtlZGlmZi1qYW5pdG9yfSwgYXMgb25lIHN1Y2ggcG9zc2libGUKLWhvb2ssIHdoaWNoIHlv dSBjYW4gYWRkIHRvIEBjb2Rle2VkaWZmLWNsZWFudXAtaG9va30gd2l0aAotQGNvZGV7YWRkLWhv b2t9LgorRWRpZmYgcHJvdmlkZXMgYSBoZWxwZXIgZnVuY3Rpb24sIEBjb2Rle2VkaWZmLWphbml0 b3J9LCB0aGF0IHlvdSBjYW4KK2ludm9rZSBmcm9tIGEgcHJpdmF0ZSBob29rIGZ1bmN0aW9uLiAg Rm9yIGV4YW1wbGU6CisKK0BleGFtcGxlCisoZGVmdW4gbXktZWRpZmYtamFuaXRvciAoKQorICAo ZWRpZmYtamFuaXRvciBuaWwgbmlsKSkKKyhhZGQtaG9vayAnZWRpZmYtY2xlYW51cC1ob29rICMn bXktZWRpZmYtamFuaXRvcikKK0BlbmQgZXhhbXBsZQogCiBAZmluZGV4IGVkaWZmLWphbml0b3IK IFRoaXMgZnVuY3Rpb24ga2lsbHMgYnVmZmVycyBBLCBCLCBhbmQsIHBvc3NpYmx5LCBDLCBpZiB0 aGVzZSBidWZmZXJzIGFyZW4ndAotLSAKMi4xMC4yCgo= --001a1148d9fe941fda0543f57229--