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#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Date: Sun, 05 Nov 2017 17:54:47 +0000 Message-ID: References: <83lgl59r6j.fsf@gnu.org> <83bmlu9dnm.fsf@gnu.org> <834lq8u0rg.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a114704224320ad055d4009f4" X-Trace: blaine.gmane.org 1509904571 19579 195.159.176.226 (5 Nov 2017 17:56:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 5 Nov 2017 17:56:11 +0000 (UTC) Cc: "27764@debbugs.gnu.org" <27764@debbugs.gnu.org> To: Eli Zaretskii , 27764-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 05 18:56:07 2017 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 1eBP9T-0004sa-4p for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Nov 2017 18:56:07 +0100 Original-Received: from localhost ([::1]:45221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBP9a-0006Hk-AK for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Nov 2017 12:56:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBP9R-0006Gh-8Y for bug-gnu-emacs@gnu.org; Sun, 05 Nov 2017 12:56:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBP9O-000721-OH for bug-gnu-emacs@gnu.org; Sun, 05 Nov 2017 12:56:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:43879) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eBP9O-00071r-Kz for bug-gnu-emacs@gnu.org; Sun, 05 Nov 2017 12:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eBP9O-0000dI-ER for bug-gnu-emacs@gnu.org; Sun, 05 Nov 2017 12:56:02 -0500 Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Nov 2017 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 27764@debbugs.gnu.org, p.stephani2@gmail.com, p.stephani2@gmail.com Original-Received: via spool by 27764-done@debbugs.gnu.org id=D27764.15099045052349 (code D ref 27764); Sun, 05 Nov 2017 17:56:02 +0000 Original-Received: (at 27764-done) by debbugs.gnu.org; 5 Nov 2017 17:55:05 +0000 Original-Received: from localhost ([127.0.0.1]:52555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBP8S-0000bo-Pp for submit@debbugs.gnu.org; Sun, 05 Nov 2017 12:55:04 -0500 Original-Received: from mail-qk0-f169.google.com ([209.85.220.169]:44857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBP8R-0000bD-TP; Sun, 05 Nov 2017 12:55:04 -0500 Original-Received: by mail-qk0-f169.google.com with SMTP id r64so8506931qkc.1; Sun, 05 Nov 2017 09:55:03 -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=o6IilbuzlxgIIveVn2o2WugpUAuO8DU9IYlHqwsVQrE=; b=XBAN25giyMfxpsGchpMEUTb37AXKdzjOq4d2gQ/U+FwQTBhERPhi9YzCi+UWsxgvK5 Wa6hgpjlEZWNTrt8Qc5i59DfZPldsdD8cD/cWkOMQk/SrKUMQ3biIZQyHI+brjBhrO1M /mEf0p++x3p38CtSl+Zf3XcaOiuH5b8vokHuTNlX337I5jyrHepG/N3AV94HQ6QzvCT4 jgTrD0wtb8YfQWRRsSzHHbp9Qu55jOA3TJk6eBRXFQcwkSsV3YnfSi41o/AbeSt8KGSM L/KtuyiapjGeYAT2xpLiY2p6XFyvXmEiG3ZlBVzes62N/dQdlk3OuYgU79bpaRqWFp78 Qd3A== 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=o6IilbuzlxgIIveVn2o2WugpUAuO8DU9IYlHqwsVQrE=; b=YvWozXSEYOLig4CbyusWn3V52s2u4byMzZxfJcUn0DKSX1c/rMZ5nelwF6Vb8geo2Y kBKYp8U5P21uiGjL+Y0BfRFxGCrL6r5f+yqZemedEVHGl1mm8CFn63lBpE8rMqkMwr7L quIy+qpjZnK73+pKOcSLSzAtRXmD6RsTFl3JaxSYgCE5uzMp8oKVMkV+204jz7UTDINU E+V0jsiRYSo05HWihXQ2hsjf+2NbxJ2bsog1TQGz9d3iIU/6tAIxx9kNv1/BZYf5Bh0t 53IyXwq5VUoxMXZYPfLv90FukRdUq1ngecJygXULUTDdV3yvgpnpNBpw+X1WiOFMpQFn Mp6g== X-Gm-Message-State: AMCzsaXlNxAc97yuwu4QKWAy52VjnG16HLGrLavm4/MNT+o/zpI3Y7xi Bg1+XdaeaigLMaBjsvR2OgM2Aos50z2RWWpkcRE= X-Google-Smtp-Source: ABhQp+Qlhgf5mLbGPwoRMGQcDGqDqmwZHPjzT5NSV+DqFh6XaFP0ZBlAxYGExcP5ZI6YgWx2tQ2yqK3547E2tJZMQAg= X-Received: by 10.55.48.70 with SMTP id w67mr17656679qkw.52.1509904498236; Sun, 05 Nov 2017 09:54:58 -0800 (PST) In-Reply-To: <834lq8u0rg.fsf@gnu.org> 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:139478 Archived-At: --001a114704224320ad055d4009f4 Content-Type: text/plain; charset="UTF-8" Eli Zaretskii schrieb am So., 5. Nov. 2017 um 17:51 Uhr: > > From: Philipp Stephani > > Date: Sun, 05 Nov 2017 16:29:35 +0000 > > Cc: 27764@debbugs.gnu.org > > > > Can we have there at least the list of the symbols that are seen in > > the sources: I see these: > > > > ediff-merge-files-with-ancestor, ediff-last-dir-ancestor, > > ediff-last-dir-C, ediff-buffers, ediff-buffers3, ediff-merge-buffers, > > ediff-merge-buffers-with-ancestor > > > > If this list is too long to be repeated in each doc string, we could > > have it once, and reference that place from the other do strings. I > > think either way would be much better than using some generic text. > > > > Here's a new version of the patch. > > Thanks, this is fine. > Thanks, pushed as 72d07d1950 to the release branch. --001a114704224320ad055d4009f4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Eli Za= retskii <eliz@gnu.org> schrieb am= So., 5. Nov. 2017 um 17:51=C2=A0Uhr:
> From: Philipp Stephani <p.stephani2@gmail.com>
> Date: Sun, 05 Nov 2017 16:29:35 +0000
> Cc: 27764@d= ebbugs.gnu.org
>
>=C2=A0 Can we have there at least the list of the symbols that are seen= in
>=C2=A0 the sources:=C2=A0 I see these:
>
>=C2=A0 =C2=A0ediff-merge-files-with-ancestor, ediff-last-dir-ancestor,<= br> >=C2=A0 =C2=A0ediff-last-dir-C, ediff-buffers, ediff-buffers3, ediff-mer= ge-buffers,
>=C2=A0 =C2=A0ediff-merge-buffers-with-ancestor
>
>=C2=A0 If this list is too long to be repeated in each doc string, we c= ould
>=C2=A0 have it once, and reference that place from the other do strings= .=C2=A0 I
>=C2=A0 think either way would be much better than using some generic te= xt.
>
> Here's a new version of the patch.

Thanks, this is fine.

Thanks, pushed as= 72d07d1950 to the release branch.=C2=A0
--001a114704224320ad055d4009f4--