From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 19 Jul 2017 09:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 27764@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15004560294104 (code B ref -1); Wed, 19 Jul 2017 09:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jul 2017 09:20:29 +0000 Received: from localhost ([127.0.0.1]:47152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXl9h-000148-HY for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXl9e-00013o-Jy for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXl9Y-0004L2-5t for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:21 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dXl9Y-0004Ku-2r for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXl9W-0004Fi-Go for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXl9V-0004IU-Dx for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:18 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:35488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXl9V-0004GP-6S for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:17 -0400 Received: by mail-wr0-x22f.google.com with SMTP id k71so2616135wrc.2 for ; Wed, 19 Jul 2017 02:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pj4rZ6ktr0MRq9NBtjQgkxB0K8WTyOpf3cCyERmhzPA=; b=FYJuYSw5Tj08voYdSCuQ9MoHoIkD5E4V/8bxVgA0K6npVAwMku3SxvNmxBHFSaNA18 BhbG8Hyx814goZmqDd8mqgEv/E7Trk+cQhouhPGUPyY70o4J9/3BblawQ2zEYISMTWYp 3TWjxijDw95baVcHDC1TnWGtkRCJui+nSwfR8Pno/bnhUII8xKKs/tSODvCmWI2VQFzB HEodUxSicgnBbyM7QX0saaRMXbWyLMBEq252bQspGPLRCvZNM2TZTryhnF++RzUWb3rK ieljRHW/szhK+YMhf3ohK7upREh95Mg08OzrQtMstWJcjFY6Q3wnN3dZCJr2rPjsG1D/ 5yuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pj4rZ6ktr0MRq9NBtjQgkxB0K8WTyOpf3cCyERmhzPA=; b=rjCLDuy4oP42zIXHv9t3H824TDoOiwJsva6J68DqZtKCHHnNP/4gy7omxHS/SpJE+c rX507XObf/zqRrvH+z65fp7hbNggLjK16+vw5f3uRET1wXtaar6cVxlEYBAuoIPo6y1w J0YCxjCwn4J0eKyuPTSLarRoWNbXjULUCQMw+x3XPCjP67euyw63+hQD1Yw8lSjgwMsd Zcg+eTEIwzaDltPs45H0dYIBuLgIC2f0gDNK27mavOs8z6E0HVruewtlxDb4Eb8yAKt2 jy7zURwGtryJ6JIISeqco1Q7zGw3+F+4JmNeevVUhe+2dOKSiyc9iswzRpsVhjfA8E9p HWqQ== X-Gm-Message-State: AIVw110wkQPe/wS9m3IFZ19ojJ6kBqd58u4kh9eO8cy9OkpGcc64dOnR h7qAx9CPRrzAMIicoZ0= X-Received: by 10.223.171.69 with SMTP id r5mr3539491wrc.57.1500456013126; Wed, 19 Jul 2017 02:20:13 -0700 (PDT) Received: from a.muc.corp.google.com ([2a00:79e0:15:4:684f:4f01:42e1:c983]) by smtp.gmail.com with ESMTPSA id o6sm5392517wrc.48.2017.07.19.02.20.12 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 19 Jul 2017 02:20:12 -0700 (PDT) From: Philipp Stephani Date: Wed, 19 Jul 2017 11:20:11 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.8 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.8 (---) The docstring of `ediff-files' doesn't document the STARTUP-HOOKS argument. Please amend the docstring. In GNU Emacs 26.0.50 (build 9, x86_64-pc-linux-gnu, GTK+ Version 3.10.8) of 2017-07-19 built on localhost Repository revision: 47429dcb4afd502e5bff9d37a09b030c0b7e0eb0 Windowing system distributor 'The X.Org Foundation', version 11.0.11803000 System Description: 'Ubuntu 14.04 LTS' Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Configured using: 'configure --enable-gcc-warnings --without-pop --with-mailutils --enable-checking --enable-check-lisp-object-type --with-modules 'CFLAGS=3D-O0 -ggdb3'' Configured features: XPM JPEG TIFF GIF PNG SOUND GSETTINGS NOTIFY GNUTLS FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message subr-x puny seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib dired dired-loaddefs format-spec rfc822 mml easymenu mml-sec password-cache epa derived epg epg-config gnus-util rmail rmail-loaddefs mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 94899 7621) (symbols 48 20234 1) (miscs 40 39 120) (strings 32 28620 1543) (string-bytes 1 766344) (vectors 16 13972) (vector-slots 8 492162 8202) (floats 8 48 68) (intervals 56 222 0) (buffers 992 12) (heap 1024 28062 1067)) --=20 Google Germany GmbH Erika-Mann-Stra=C3=9Fe 33 80636 M=C3=BCnchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Gesch=C3=A4ftsf=C3=BChrer: Matthew Scott Sucherman, Paul Terence Manicle Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und l=C3= =B6schen Sie die E-Mail und alle Anh=C3=A4nge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do = not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks. From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Sep 2017 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 27764@debbugs.gnu.org Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150619243717126 (code B ref 27764); Sat, 23 Sep 2017 18:48:02 +0000 Received: (at 27764) by debbugs.gnu.org; 23 Sep 2017 18:47:17 +0000 Received: from localhost ([127.0.0.1]:54889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvpSO-0004S9-NA for submit@debbugs.gnu.org; Sat, 23 Sep 2017 14:47:17 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:49747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvpSM-0004Rv-O5 for 27764@debbugs.gnu.org; Sat, 23 Sep 2017 14:47:15 -0400 Received: by mail-oi0-f51.google.com with SMTP id i128so2396886oih.6 for <27764@debbugs.gnu.org>; Sat, 23 Sep 2017 11:47:14 -0700 (PDT) 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; bh=huJbBadTh640J6lLGp0KRfs2VzFMzuz22clIRroUD20=; b=BRv/9XB5XT6JNWnpMeC6BJUstHam0X1gicAv6u6sid8L8UBBr0I3KAOox/PGncOnrs eIR64+Es8R1q6r6grOZ74tsGfHwQaJ7HpSRec88xr87tnf5ojFjqZbify+0+xjXAaV3n aloiLzryoeHwxUSVpS59h4eHetT2mM2YryRy2ux3el3p1+OcQ9xv1itknf9+8B/f6o5Z vWKTDJ987UsNQ9Tih9CAXWvYlVr3W5hftXqbb/sZeaqTuWBdhaB5Tic4xIOxDUYVt9Ar nlCJu48EZf5jGLBgBmU9vggYOzwH8ubxBv9xjRa+8fuxUeofqxsr5ufhuiGNc8yU6CYM DMVQ== 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; bh=huJbBadTh640J6lLGp0KRfs2VzFMzuz22clIRroUD20=; b=Y+OtfqHghAQcpi0kFBhzK67pQKt6+xtQ4OapV2ud5hfSNqhwgfAexeklhYX/5pISaK UjLHRsQWuiBTPkkO62uEyrYKbXjTtvUUV2jYzkx/e4m66P2uReXT8eNfN7tHkaLRxVss vOCGtlVj2NpdLEVBVnl8yFMFBs4cuHp8RIVn7GnkaraP6Hw6rwLH37u4KO7DbX9Nd0xb +Tdf7wM7sJsP6w9s+sigToZVKUqhJtTDVIZMw6+omu+unvnv1tV7EY/CNnVSWgh9Gm2B b865L3aPKAPRFp3sMmJZRjns4K6zQj7Sn7Bx5NH8Dr4Wld2WICAlCahC7bWhkTmm3ysv fDGQ== X-Gm-Message-State: AHPjjUixYC78HgFMIILDMoRhitrU2YS8GgY7fL5sqP0k7pDjGV9Ns55U uKvbNqLE/dlS9iXtukmmErfvN4fAgcsRV/GrYSAKyw== X-Google-Smtp-Source: AOwi7QAiWy3lJarB1TUrEh4W9puxQWUeTSEA7fpEi4zvEIo8pWaGyJwfnNT2/qGj/wnNu+L4Ht6Amto5mmokiNaieeQ= X-Received: by 10.202.171.147 with SMTP id u141mr3061972oie.312.1506192428875; Sat, 23 Sep 2017 11:47:08 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Philipp Stephani Date: Sat, 23 Sep 2017 18:46:57 +0000 Message-ID: Content-Type: multipart/mixed; boundary="001a113cc362afe4a40559dfc062" X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) --001a113cc362afe4a40559dfc062 Content-Type: multipart/alternative; boundary="001a113cc362afe4a00559dfc060" --001a113cc362afe4a00559dfc060 Content-Type: text/plain; charset="UTF-8" Philipp Stephani schrieb am Mi., 19. Juli 2017 um 11:20 Uhr: > > The docstring of `ediff-files' doesn't document the STARTUP-HOOKS > argument. Please amend the docstring. > > > Here's a patch that adds some missing documentation to ediff.el. --001a113cc362afe4a00559dfc060 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Philip= p Stephani <p.stephani2@gmail.c= om> schrieb am Mi., 19. Juli 2017 um 11:20=C2=A0Uhr:

The docstring of `ediff-files' doesn't document the STARTUP-HOOKS argument.=C2=A0 Please amend the docstring.



Here's a patch that adds some miss= ing documentation to ediff.el.=C2=A0
--001a113cc362afe4a00559dfc060-- --001a113cc362afe4a40559dfc062 Content-Type: text/plain; charset="US-ASCII"; name="0001-Ediff-add-some-missing-documentation.txt" Content-Disposition: attachment; filename="0001-Ediff-add-some-missing-documentation.txt" Content-Transfer-Encoding: base64 Content-ID: <15eb00f93665970ead71> X-Attachment-Id: 15eb00f93665970ead71 RnJvbSA3NjVmZTE1YzliMmUxMmRhYWUyMGEzNWUwMWJmYzA0ZjM3YjllN2JmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwIFN0ZXBoYW5pIDxwaHN0QGdvb2dsZS5jb20+CkRh dGU6IFNhdCwgMjMgU2VwIDIwMTcgMjA6NDM6NDQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBFZGlm ZjogYWRkIHNvbWUgbWlzc2luZyBkb2N1bWVudGF0aW9uCgoqIHZjL2VkaWZmLmVsIChlZGlmZi1m aWxlcywgZWRpZmYtZmlsZXMzLCBlZGlmZi1idWZmZXJzKQooZWRpZmYtYnVmZmVyczMsIGVkaWZm LW1lcmdlLWRpcmVjdG9yaWVzKQooZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMtd2l0aC1hbmNlc3Rv cikKKGVkaWZmLW1lcmdlLWRpcmVjdG9yeS1yZXZpc2lvbnMpCihlZGlmZi1tZXJnZS1kaXJlY3Rv cnktcmV2aXNpb25zLXdpdGgtYW5jZXN0b3IpCihlZGlmZi13aW5kb3dzLXdvcmR3aXNlLCBlZGlm Zi13aW5kb3dzLWxpbmV3aXNlKQooZWRpZmYtcmVnaW9ucy13b3Jkd2lzZSwgZWRpZmYtcmVnaW9u cy1saW5ld2lzZSkKKGVkaWZmLW1lcmdlLWZpbGVzLCBlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtYnVmZmVycywgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtcmV2aXNpb25zLCBlZGlmZi1tZXJnZS1yZXZpc2lvbnMtd2l0 aC1hbmNlc3RvcikKKGVkaWZmLXBhdGNoLWZpbGUsIGVkaWZmLXJldmlzaW9uKTogRG9jdW1lbnQg bWlzc2luZyBhcmd1bWVudHMuCihlZGlmZi1wYXRjaC1idWZmZXIsIGVkaWZmLXJldmlzaW9uKTog QWRkIHNlY29uZCBzcGFjZSBhZnRlcgpwZXJpb2QuCihlZGlmZi1maWxlcy1jb21tYW5kLCBlZGlm ZjMtZmlsZXMtY29tbWFuZCwgZWRpZmYtbWVyZ2UtY29tbWFuZCkKKGVkaWZmLW1lcmdlLXdpdGgt YW5jZXN0b3ItY29tbWFuZCwgZWRpZmYtZGlyZWN0b3JpZXMtY29tbWFuZCkKKGVkaWZmLWRpcmVj dG9yaWVzMy1jb21tYW5kLCBlZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy1jb21tYW5kKTogQWRkCmRv Y3VtZW50YXRpb24gZm9yIHRoZSBjb21tYW5kIGxpbmUgZnVuY3Rpb25zLgotLS0KIGxpc3AvdmMv ZWRpZmYuZWwgfCAxMTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDg5IGluc2VydGlvbnMoKyksIDI1IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdmMvZWRpZmYuZWwgYi9saXNwL3ZjL2VkaWZmLmVs CmluZGV4IGQwZjhlNjNkY2IuLjYzZmFhZTliMjUgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvZWRpZmYu ZWwKKysrIGIvbGlzcC92Yy9lZGlmZi5lbApAQCAtMTg1LDcgKzE4NSw5IEBAIGVkaWZmLWdldC1k ZWZhdWx0LWZpbGUtbmFtZQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWZpbGVzIChm aWxlLUEgZmlsZS1CICZvcHRpb25hbCBzdGFydHVwLWhvb2tzKQotICAiUnVuIEVkaWZmIG9uIGEg cGFpciBvZiBmaWxlcywgRklMRS1BIGFuZCBGSUxFLUIuIgorICAiUnVuIEVkaWZmIG9uIGEgcGFp ciBvZiBmaWxlcywgRklMRS1BIGFuZCBGSUxFLUIuCitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBv ZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0 dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRp ci1BIChpZiBlZGlmZi11c2UtbGFzdC1kaXIKIAkJICAgIGVkaWZmLWxhc3QtZGlyLUEKQEAgLTIy MSw3ICsyMjMsOSBAQCBlZGlmZi1maWxlcwogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZm LWZpbGVzMyAoZmlsZS1BIGZpbGUtQiBmaWxlLUMgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3MpCi0g ICJSdW4gRWRpZmYgb24gdGhyZWUgZmlsZXMsIEZJTEUtQSwgRklMRS1CLCBhbmQgRklMRS1DLiIK KyAgIlJ1biBFZGlmZiBvbiB0aHJlZSBmaWxlcywgRklMRS1BLCBGSUxFLUIsIGFuZCBGSUxFLUMu CitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3 aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAg IChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChpZiBlZGlmZi11c2UtbGFzdC1kaXIKIAkJ ICAgIGVkaWZmLWxhc3QtZGlyLUEKQEAgLTQxOSw3ICs0MjMsMTEgQEAgZWRpZmYtYmFja3VwCiAK IDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtYnVmZmVycyAoYnVmZmVyLUEgYnVmZmVyLUIg Jm9wdGlvbmFsIHN0YXJ0dXAtaG9va3Mgam9iLW5hbWUpCi0gICJSdW4gRWRpZmYgb24gYSBwYWly IG9mIGJ1ZmZlcnMsIEJVRkZFUi1BIGFuZCBCVUZGRVItQi4iCisgICJSdW4gRWRpZmYgb24gYSBw YWlyIG9mIGJ1ZmZlcnMsIEJVRkZFUi1BIGFuZCBCVUZGRVItQi4KK1NUQVJUVVAtSE9PS1MgaXMg YSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQKK2FyZ3VtZW50cyBh ZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYQorc3ltYm9s IGRlc2NyaWJpbmcgdGhlIEVkaWZmIGpvYiB0eXBlOyBpdCBkZWZhdWx0cyB0bworYGVkaWZmLWJ1 ZmZlcnMnLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0IChiZikKICAgICAgKGxpc3QgKHNldHEg YmYgKHJlYWQtYnVmZmVyICJCdWZmZXIgQSB0byBjb21wYXJlOiAiCkBAIC00NDEsNyArNDQ5LDEx IEBAICdlYnVmZmVycwogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZi1idWZmZXJzMyAoYnVm ZmVyLUEgYnVmZmVyLUIgYnVmZmVyLUMKIAkJCQkgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3Mgam9i LW5hbWUpCi0gICJSdW4gRWRpZmYgb24gdGhyZWUgYnVmZmVycywgQlVGRkVSLUEsIEJVRkZFUi1C LCBhbmQgQlVGRkVSLUMuIgorICAiUnVuIEVkaWZmIG9uIHRocmVlIGJ1ZmZlcnMsIEJVRkZFUi1B LCBCVUZGRVItQiwgYW5kIEJVRkZFUi1DLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVu Y3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcg dXAgdGhlIEVkaWZmIGJ1ZmZlcnMuICBKT0ItTkFNRSBpcyBhCitzeW1ib2wgZGVzY3JpYmluZyB0 aGUgRWRpZmYgam9iIHR5cGU7IGl0IGRlZmF1bHRzIHRvCitgZWRpZmYtYnVmZmVyczMnLiIKICAg KGludGVyYWN0aXZlCiAgICAobGV0IChiZiBiZmYpCiAgICAgIChsaXN0IChzZXRxIGJmIChyZWFk LWJ1ZmZlciAiQnVmZmVyIEEgdG8gY29tcGFyZTogIgpAQCAtNjM3LDcgKzY0OSw4IEBAICdlZGly czMKIChkZWZ1biBlZGlmZi1tZXJnZS1kaXJlY3RvcmllcyAoZGlyMSBkaXIyIHJlZ2V4cCAmb3B0 aW9uYWwgbWVyZ2UtYXV0b3N0b3JlLWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIHBhaXIgb2YgZGly ZWN0b3JpZXMsIERJUjEgYW5kIERJUjIsIG1lcmdpbmcgZmlsZXMgdGhhdCBoYXZlCiB0aGUgc2Ft ZSBuYW1lIGluIGJvdGguICBUaGUgdGhpcmQgYXJndW1lbnQsIFJFR0VYUCwgaXMgbmlsIG9yIGEg cmVndWxhcgotZXhwcmVzc2lvbjsgb25seSBmaWxlIG5hbWVzIHRoYXQgbWF0Y2ggdGhlIHJlZ2V4 cCBhcmUgY29uc2lkZXJlZC4iCitleHByZXNzaW9uOyBvbmx5IGZpbGUgbmFtZXMgdGhhdCBtYXRj aCB0aGUgcmVnZXhwIGFyZSBjb25zaWRlcmVkLgorTUVSR0UtQVVUT1NUT1JFLURJUiBpcyB0aGUg ZGlyZWN0b3J5IGluIHdoaWNoIHRvIHN0b3JlIG1lcmdlZCBmaWxlcy4iCiAgIChpbnRlcmFjdGl2 ZQogICAgKGxldCAoKGRpci1BIChlZGlmZi1nZXQtZGVmYXVsdC1kaXJlY3RvcnktbmFtZSkpCiAJ IChkZWZhdWx0LXJlZ2V4cCAoZXZhbCBlZGlmZi1kZWZhdWx0LWZpbHRlcmluZy1yZWdleHApKQpA QCAtNjc0LDcgKzY4Nyw4IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLXdpdGgtYW5jZXN0b3IK IEVkaWZmIG1lcmdlcyBmaWxlcyB0aGF0IGhhdmUgaWRlbnRpY2FsIG5hbWVzIGluIERJUjEsIERJ UjIuICBJZiBhIHBhaXIgb2YgZmlsZXMKIGluIERJUjEgYW5kIERJUjIgZG9lc24ndCBoYXZlIGFu IGFuY2VzdG9yIGluIEFOQ0VTVE9SLURJUiwgRWRpZmYgd2lsbCBtZXJnZQogd2l0aG91dCBhbmNl c3Rvci4gIFRoZSBmb3VydGggYXJndW1lbnQsIFJFR0VYUCwgaXMgbmlsIG9yIGEgcmVndWxhciBl eHByZXNzaW9uOwotb25seSBmaWxlIG5hbWVzIHRoYXQgbWF0Y2ggdGhlIHJlZ2V4cCBhcmUgY29u c2lkZXJlZC4iCitvbmx5IGZpbGUgbmFtZXMgdGhhdCBtYXRjaCB0aGUgcmVnZXhwIGFyZSBjb25z aWRlcmVkLgorTUVSR0UtQVVUT1NUT1JFLURJUiBpcyB0aGUgZGlyZWN0b3J5IGluIHdoaWNoIHRv IHN0b3JlIG1lcmdlZCBmaWxlcy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChl ZGlmZi1nZXQtZGVmYXVsdC1kaXJlY3RvcnktbmFtZSkpCiAJIChkZWZhdWx0LXJlZ2V4cCAoZXZh bCBlZGlmZi1kZWZhdWx0LWZpbHRlcmluZy1yZWdleHApKQpAQCAtNzEwLDcgKzcyNCw4IEBAIGVk aWZmLW1lcmdlLWRpcmVjdG9yeS1yZXZpc2lvbnMKIAkJCQkJICAgICAmb3B0aW9uYWwgbWVyZ2Ut YXV0b3N0b3JlLWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIGRpcmVjdG9yeSwgRElSMSwgbWVyZ2lu ZyBpdHMgZmlsZXMgd2l0aCB0aGVpciByZXZpc2lvbnMuCiBUaGUgc2Vjb25kIGFyZ3VtZW50LCBS RUdFWFAsIGlzIGEgcmVndWxhciBleHByZXNzaW9uIHRoYXQgZmlsdGVycyB0aGUgZmlsZQotbmFt ZXMuICBPbmx5IHRoZSBmaWxlcyB0aGF0IGFyZSB1bmRlciByZXZpc2lvbiBjb250cm9sIGFyZSB0 YWtlbiBpbnRvIGFjY291bnQuIgorbmFtZXMuICBPbmx5IHRoZSBmaWxlcyB0aGF0IGFyZSB1bmRl ciByZXZpc2lvbiBjb250cm9sIGFyZSB0YWtlbiBpbnRvIGFjY291bnQuCitNRVJHRS1BVVRPU1RP UkUtRElSIGlzIHRoZSBkaXJlY3RvcnkgaW4gd2hpY2ggdG8gc3RvcmUgbWVyZ2VkIGZpbGVzLiIK ICAgKGludGVyYWN0aXZlCiAgICAobGV0ICgoZGlyLUEgKGVkaWZmLWdldC1kZWZhdWx0LWRpcmVj dG9yeS1uYW1lKSkKIAkgKGRlZmF1bHQtcmVnZXhwIChldmFsIGVkaWZmLWRlZmF1bHQtZmlsdGVy aW5nLXJlZ2V4cCkpCkBAIC03NDAsNyArNzU1LDggQEAgZWRpZmYtbWVyZ2UtZGlyZWN0b3J5LXJl dmlzaW9ucy13aXRoLWFuY2VzdG9yCiAJCQkJCQkJICAgbWVyZ2UtYXV0b3N0b3JlLWRpcikKICAg IlJ1biBFZGlmZiBvbiBhIGRpcmVjdG9yeSwgRElSMSwgbWVyZ2luZyBpdHMgZmlsZXMgd2l0aCB0 aGVpciByZXZpc2lvbnMgYW5kIGFuY2VzdG9ycy4KIFRoZSBzZWNvbmQgYXJndW1lbnQsIFJFR0VY UCwgaXMgYSByZWd1bGFyIGV4cHJlc3Npb24gdGhhdCBmaWx0ZXJzIHRoZSBmaWxlCi1uYW1lcy4g IE9ubHkgdGhlIGZpbGVzIHRoYXQgYXJlIHVuZGVyIHJldmlzaW9uIGNvbnRyb2wgYXJlIHRha2Vu IGludG8gYWNjb3VudC4iCituYW1lcy4gIE9ubHkgdGhlIGZpbGVzIHRoYXQgYXJlIHVuZGVyIHJl dmlzaW9uIGNvbnRyb2wgYXJlIHRha2VuIGludG8gYWNjb3VudC4KK01FUkdFLUFVVE9TVE9SRS1E SVIgaXMgdGhlIGRpcmVjdG9yeSBpbiB3aGljaCB0byBzdG9yZSBtZXJnZWQgZmlsZXMuIgogICAo aW50ZXJhY3RpdmUKICAgIChsZXQgKChkaXItQSAoZWRpZmYtZ2V0LWRlZmF1bHQtZGlyZWN0b3J5 LW5hbWUpKQogCSAoZGVmYXVsdC1yZWdleHAgKGV2YWwgZWRpZmYtZGVmYXVsdC1maWx0ZXJpbmct cmVnZXhwKSkKQEAgLTkwOCw3ICs5MjQsOSBAQCBlZGlmZi13aW5kb3dzLXdvcmR3aXNlCiBXaXRo IHByZWZpeCBhcmd1bWVudCwgRFVNQi1NT0RFLCBvciBvbiBhIG5vbi13aW5kb3dpbmcgZGlzcGxh eSwgd29ya3MgYXMKIGZvbGxvd3M6CiBJZiBXSU5ELUEgaXMgbmlsLCB1c2Ugc2VsZWN0ZWQgd2lu ZG93LgotSWYgV0lORC1CIGlzIG5pbCwgdXNlIHdpbmRvdyBuZXh0IHRvIFdJTkQtQS4iCitJZiBX SU5ELUIgaXMgbmlsLCB1c2Ugd2luZG93IG5leHQgdG8gV0lORC1BLgorU1RBUlRVUC1IT09LUyBp cyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRz IGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUgIlAi KQogICAoZWRpZmYtd2luZG93cyBkdW1iLW1vZGUgd2luZC1BIHdpbmQtQgogCQkgc3RhcnR1cC1o b29rcyAnZWRpZmYtd2luZG93cy13b3Jkd2lzZSAnd29yZC1tb2RlKSkKQEAgLTkxOSw3ICs5Mzcs OSBAQCBlZGlmZi13aW5kb3dzLWxpbmV3aXNlCiBXaXRoIHByZWZpeCBhcmd1bWVudCwgRFVNQi1N T0RFLCBvciBvbiBhIG5vbi13aW5kb3dpbmcgZGlzcGxheSwgd29ya3MgYXMKIGZvbGxvd3M6CiBJ ZiBXSU5ELUEgaXMgbmlsLCB1c2Ugc2VsZWN0ZWQgd2luZG93LgotSWYgV0lORC1CIGlzIG5pbCwg dXNlIHdpbmRvdyBuZXh0IHRvIFdJTkQtQS4iCitJZiBXSU5ELUIgaXMgbmlsLCB1c2Ugd2luZG93 IG5leHQgdG8gV0lORC1BLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRo YXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVk aWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUgIlAiKQogICAoZWRpZmYtd2luZG93cyBkdW1i LW1vZGUgd2luZC1BIHdpbmQtQgogCQkgc3RhcnR1cC1ob29rcyAnZWRpZmYtd2luZG93cy1saW5l d2lzZSBuaWwpKQpAQCAtOTYzLDkgKzk4MywxMiBAQCBlZGlmZi13aW5kb3dzCiA7OzsjIyNhdXRv bG9hZAogKGRlZnVuIGVkaWZmLXJlZ2lvbnMtd29yZHdpc2UgKGJ1ZmZlci1BIGJ1ZmZlci1CICZv cHRpb25hbCBzdGFydHVwLWhvb2tzKQogICAiUnVuIEVkaWZmIG9uIGEgcGFpciBvZiByZWdpb25z IGluIHNwZWNpZmllZCBidWZmZXJzLgorQlVGRkVSLUEgYW5kIEJVRkZFUi1CIGFyZSB0aGUgYnVm ZmVycyB0byBiZSBjb21wYXJlZC4KIFJlZ2lvbnMgKGkuZS4sIHBvaW50IGFuZCBtYXJrKSBjYW4g YmUgc2V0IGluIGFkdmFuY2Ugb3IgbWFya2VkIGludGVyYWN0aXZlbHkuCiBUaGlzIGZ1bmN0aW9u IGlzIGVmZmVjdGl2ZSBvbmx5IGZvciByZWxhdGl2ZWx5IHNtYWxsIHJlZ2lvbnMsIHVwIHRvIDIw MAotbGluZXMuICBGb3IgbGFyZ2UgcmVnaW9ucywgdXNlIGBlZGlmZi1yZWdpb25zLWxpbmV3aXNl Jy4iCitsaW5lcy4gIEZvciBsYXJnZSByZWdpb25zLCB1c2UgYGVkaWZmLXJlZ2lvbnMtbGluZXdp c2UnLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2Fs bHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMu IgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKGJmKQogICAgICAobGlzdCAoc2V0cSBiZiAocmVh ZC1idWZmZXIgIlJlZ2lvbidzIEEgYnVmZmVyOiAiCkBAIC0xMDAzLDEwICsxMDI2LDEzIEBAIGVk aWZmLXJlZ2lvbnMtd29yZHdpc2UKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtcmVnaW9u cy1saW5ld2lzZSAoYnVmZmVyLUEgYnVmZmVyLUIgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3MpCiAg ICJSdW4gRWRpZmYgb24gYSBwYWlyIG9mIHJlZ2lvbnMgaW4gc3BlY2lmaWVkIGJ1ZmZlcnMuCitC VUZGRVItQSBhbmQgQlVGRkVSLUIgYXJlIHRoZSBidWZmZXJzIHRvIGJlIGNvbXBhcmVkLgogUmVn aW9ucyAoaS5lLiwgcG9pbnQgYW5kIG1hcmspIGNhbiBiZSBzZXQgaW4gYWR2YW5jZSBvciBtYXJr ZWQgaW50ZXJhY3RpdmVseS4KIEVhY2ggcmVnaW9uIGlzIGVubGFyZ2VkIHRvIGNvbnRhaW4gZnVs bCBsaW5lcy4KIFRoaXMgZnVuY3Rpb24gaXMgZWZmZWN0aXZlIGZvciBsYXJnZSByZWdpb25zLCBv dmVyIDEwMC0yMDAKLWxpbmVzLiAgRm9yIHNtYWxsIHJlZ2lvbnMsIHVzZSBgZWRpZmYtcmVnaW9u cy13b3Jkd2lzZScuIgorbGluZXMuICBGb3Igc21hbGwgcmVnaW9ucywgdXNlIGBlZGlmZi1yZWdp b25zLXdvcmR3aXNlJy4KK1NUQVJUVVAtSE9PS1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0 IEVtYWNzIGNhbGxzIHdpdGhvdXQKK2FyZ3VtZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlm ZiBidWZmZXJzLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0IChiZikKICAgICAgKGxpc3QgKHNl dHEgYmYgKHJlYWQtYnVmZmVyICJSZWdpb24gQSdzIGJ1ZmZlcjogIgpAQCAtMTEyNyw3ICsxMTUz LDExIEBAIGVkaWZmLW1lcmdlLWZpbGVzCiAJCQkJIDs7IE1FUkdFLUJVRkZFUi1GSUxFIGlzIHRo ZSBmaWxlIHRvIGJlCiAJCQkJIDs7IGFzc29jaWF0ZWQgd2l0aCB0aGUgbWVyZ2UgYnVmZmVyCiAJ CQkJICZvcHRpb25hbCBzdGFydHVwLWhvb2tzIG1lcmdlLWJ1ZmZlci1maWxlKQotICAiTWVyZ2Ug dHdvIGZpbGVzIHdpdGhvdXQgYW5jZXN0b3IuIgorICAiTWVyZ2UgdHdvIGZpbGVzIHdpdGhvdXQg YW5jZXN0b3IuCitGSUxFLUEgYW5kIEZJTEUtQiBhcmUgdGhlIG5hbWVzIG9mIHRoZSBmaWxlcyB0 byBiZSBtZXJnZWQuCitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBF bWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYg YnVmZmVycy4gIE1FUkdFLUJVRkZFUi1GSUxFCitpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZSB0byBi ZSBhc3NvY2lhdGVkIHdpdGggdGhlIG1lcmdlIGJ1ZmZlci4uIgogICAoaW50ZXJhY3RpdmUKICAg IChsZXQgKChkaXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRp ci1BCkBAIC0xMTcxLDcgKzEyMDEsMTIgQEAgZWRpZmYtbWVyZ2UtZmlsZXMtd2l0aC1hbmNlc3Rv cgogCQkJCQkgICAgICAgOzsgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZQogCQkJCQkgICAgICAg OzsgbWVyZ2UgYnVmZmVyCiAJCQkJCSAgICAgICBtZXJnZS1idWZmZXItZmlsZSkKLSAgIk1lcmdl IHR3byBmaWxlcyB3aXRoIGFuY2VzdG9yLiIKKyAgIk1lcmdlIHR3byBmaWxlcyB3aXRoIGFuY2Vz dG9yLgorRklMRS1BIGFuZCBGSUxFLUIgYXJlIHRoZSBuYW1lcyBvZiB0aGUgZmlsZXMgdG8gYmUg bWVyZ2VkLCBhbmQKK0ZJTEUtQU5DRVNUT1IgaXMgdGhlIG5hbWUgb2YgdGhlIGFuY2VzdG9yIGZp bGUuICBTVEFSVFVQLUhPT0tTIGlzCithIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2Fs bHMgd2l0aG91dCBhcmd1bWVudHMgYWZ0ZXIKK3NldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMu ICBNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZgordGhlIGZpbGUgdG8gYmUgYXNzb2Np YXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChk aXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRpci1BCkBAIC0x MjI5LDcgKzEyNjQsMTMgQEAgZWRpZmYtbWVyZ2UtYnVmZmVycwogCQkJCSAgICAgOzsgTUVSR0Ut QlVGRkVSLUZJTEUgaXMgdGhlIGZpbGUgdG8gYmUKIAkJCQkgICAgIDs7IGFzc29jaWF0ZWQgd2l0 aCB0aGUgbWVyZ2UgYnVmZmVyCiAJCQkJICAgICBzdGFydHVwLWhvb2tzIGpvYi1uYW1lIG1lcmdl LWJ1ZmZlci1maWxlKQotICAiTWVyZ2UgYnVmZmVycyB3aXRob3V0IGFuY2VzdG9yLiIKKyAgIk1l cmdlIGJ1ZmZlcnMgd2l0aG91dCBhbmNlc3Rvci4KK0JVRkZFUi1BIGFuZCBCVUZGRVItQiBhcmUg dGhlIGJ1ZmZlcnMgdG8gYmUgbWVyZ2VkLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVu Y3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcg dXAgdGhlIEVkaWZmIGJ1ZmZlcnMuICBKT0ItTkFNRSBpcyBhCitzeW1ib2wgZGVzY3JpYmluZyB0 aGUgRWRpZmYgam9iIHR5cGU7IGl0IGRlZmF1bHRzIHRvCitgZWRpZmYtbWVyZ2UtYnVmZmVycycu ICBNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZQordG8gYmUgYXNzb2Np YXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKGJm KQogICAgICAobGlzdCAoc2V0cSBiZiAocmVhZC1idWZmZXIgIkJ1ZmZlciBBIHRvIG1lcmdlOiAi CkBAIC0xMjU2LDcgKzEyOTcsMTQgQEAgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFuY2VzdG9y CiAJCQkJCQkgICA7OyBmaWxlIHRvIGJlIGFzc29jaWF0ZWQKIAkJCQkJCSAgIDs7IHdpdGggdGhl IG1lcmdlIGJ1ZmZlcgogCQkJCQkJICAgbWVyZ2UtYnVmZmVyLWZpbGUpCi0gICJNZXJnZSBidWZm ZXJzIHdpdGggYW5jZXN0b3IuIgorICAiTWVyZ2UgYnVmZmVycyB3aXRoIGFuY2VzdG9yLgorQlVG RkVSLUEgYW5kIEJVRkZFUi1CIGFyZSB0aGUgYnVmZmVycyB0byBiZSBtZXJnZWQsIGFuZAorQlVG RkVSLUFOQ0VTVE9SIGlzIHRoZWlyIGFuY2VzdG9yLiAgU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qg b2YKK2Z1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQgYXJndW1lbnRzIGFmdGVyIHNl dHRpbmcgdXAgdGhlCitFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYSBzeW1ib2wgZGVzY3Jp YmluZyB0aGUgRWRpZmYgam9iCit0eXBlOyBpdCBkZWZhdWx0cyB0byBgZWRpZmYtbWVyZ2UtYnVm ZmVycy13aXRoLWFuY2VzdG9yJy4KK01FUkdFLUJVRkZFUi1GSUxFIGlzIHRoZSBuYW1lIG9mIHRo ZSBmaWxlIHRvIGJlIGFzc29jaWF0ZWQgd2l0aAordGhlIG1lcmdlIGJ1ZmZlci4iCiAgIChpbnRl cmFjdGl2ZQogICAgKGxldCAoYmYgYmZmKQogICAgICAobGlzdCAoc2V0cSBiZiAocmVhZC1idWZm ZXIgIkJ1ZmZlciBBIHRvIG1lcmdlOiAiCkBAIC0xMjg3LDggKzEzMzUsMTEgQEAgZWRpZmYtbWVy Z2UtYnVmZmVycy13aXRoLWFuY2VzdG9yCiAoZGVmdW4gZWRpZmYtbWVyZ2UtcmV2aXNpb25zICgm b3B0aW9uYWwgZmlsZSBzdGFydHVwLWhvb2tzIG1lcmdlLWJ1ZmZlci1maWxlKQogICA7OyBNRVJH RS1CVUZGRVItRklMRSBpcyB0aGUgZmlsZSB0byBiZSBhc3NvY2lhdGVkIHdpdGggdGhlIG1lcmdl IGJ1ZmZlcgogICAiUnVuIEVkaWZmIGJ5IG1lcmdpbmcgdHdvIHJldmlzaW9ucyBvZiBhIGZpbGUu Ci1UaGUgZmlsZSBpcyB0aGUgb3B0aW9uYWwgRklMRSBhcmd1bWVudCBvciB0aGUgZmlsZSB2aXNp dGVkIGJ5IHRoZSBjdXJyZW50Ci1idWZmZXIuIgorVGhlIGZpbGUgaXMgdGhlIG9wdGlvbmFsIEZJ TEUgYXJndW1lbnQgb3IgdGhlIGZpbGUgdmlzaXRlZCBieSB0aGUKK2N1cnJlbnQgYnVmZmVyLiAg U1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MKK2NhbGxzIHdp dGhvdXQgYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuCitNRVJH RS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZSB0byBiZSBhc3NvY2lhdGVkIHdp dGgKK3RoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUpCiAgIChpZiAoc3RyaW5ncCBm aWxlKSAoZmluZC1maWxlIGZpbGUpKQogICAobGV0IChyZXYxIHJldjIpCkBAIC0xMzE5LDggKzEz NzAsMTEgQEAgZWRpZmYtbWVyZ2UtcmV2aXNpb25zLXdpdGgtYW5jZXN0b3IKIAkJCQkJICAgIDs7 IGJ1ZmZlcgogCQkJCQkgICAgbWVyZ2UtYnVmZmVyLWZpbGUpCiAgICJSdW4gRWRpZmYgYnkgbWVy Z2luZyB0d28gcmV2aXNpb25zIG9mIGEgZmlsZSB3aXRoIGEgY29tbW9uIGFuY2VzdG9yLgotVGhl IGZpbGUgaXMgdGhlIG9wdGlvbmFsIEZJTEUgYXJndW1lbnQgb3IgdGhlIGZpbGUgdmlzaXRlZCBi eSB0aGUgY3VycmVudAotYnVmZmVyLiIKK1RoZSBmaWxlIGlzIHRoZSBvcHRpb25hbCBGSUxFIGFy Z3VtZW50IG9yIHRoZSBmaWxlIHZpc2l0ZWQgYnkgdGhlCitjdXJyZW50IGJ1ZmZlci4gIFNUQVJU VVAtSE9PS1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzCitjYWxscyB3aXRob3V0 IGFyZ3VtZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLgorTUVSR0UtQlVG RkVSLUZJTEUgaXMgdGhlIG5hbWUgb2YgdGhlIGZpbGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRoCit0 aGUgbWVyZ2UgYnVmZmVyLiIKICAgKGludGVyYWN0aXZlKQogICAoaWYgKHN0cmluZ3AgZmlsZSkg KGZpbmQtZmlsZSBmaWxlKSkKICAgKGxldCAocmV2MSByZXYyIGFuY2VzdG9yLXJldikKQEAgLTEz NjAsOCArMTQxNCw4IEBAIGVkaWZmLXBhdGNoLWZpbGUKICAgIlF1ZXJ5IGZvciBhIGZpbGUgbmFt ZSwgYW5kIHRoZW4gcnVuIEVkaWZmIGJ5IHBhdGNoaW5nIHRoYXQgZmlsZS4KIElmIG9wdGlvbmFs IFBBVENILUJVRiBpcyBnaXZlbiwgdXNlIHRoZSBwYXRjaCBpbiB0aGF0IGJ1ZmZlcgogYW5kIGRv bid0IGFzayB0aGUgdXNlci4KLUlmIHByZWZpeCBhcmd1bWVudCwgdGhlbjogaWYgZXZlbiBhcmd1 bWVudCwgYXNzdW1lIHRoYXQgdGhlIHBhdGNoIGlzIGluIGEKLWJ1ZmZlci4gSWYgb2RkIC0tIGFz c3VtZSBpdCBpcyBpbiBhIGZpbGUuIgorSWYgcHJlZml4IGFyZ3VtZW50IEFSRywgdGhlbjogaWYg ZXZlbiBhcmd1bWVudCwgYXNzdW1lIHRoYXQgdGhlCitwYXRjaCBpcyBpbiBhIGJ1ZmZlci4gIElm IG9kZCAtLSBhc3N1bWUgaXQgaXMgaW4gYSBmaWxlLiIKICAgKGludGVyYWN0aXZlICJQIikKICAg KGxldCAoc291cmNlLWRpciBzb3VyY2UtZmlsZSkKICAgICAocmVxdWlyZSAnZWRpZmYtcHRjaCkK QEAgLTEzOTQsNyArMTQ0OCw3IEBAIGVkaWZmLXBhdGNoLWJ1ZmZlcgogV2l0aCBBUkc9MSwgYXNz dW1lcyB0aGUgcGF0Y2ggaXMgaW4gYSBmaWxlIGFuZCBwcm9tcHRzIGZvciB0aGUgZmlsZS4KIFdp dGggQVJHPTIsIGFzc3VtZXMgdGhlIHBhdGNoIGlzIGluIGEgYnVmZmVyIGFuZCBwcm9tcHRzIGZv ciB0aGUgYnVmZmVyLgogUEFUQ0gtQlVGIGlzIGFuIG9wdGlvbmFsIGFyZ3VtZW50LCB3aGljaCBz cGVjaWZpZXMgdGhlIGJ1ZmZlciB0aGF0IGNvbnRhaW5zIHRoZQotcGF0Y2guIElmIG5vdCBnaXZl biwgdGhlIHVzZXIgaXMgcHJvbXB0ZWQgYWNjb3JkaW5nIHRvIHRoZSBwcmVmaXggYXJndW1lbnQu IgorcGF0Y2guICBJZiBub3QgZ2l2ZW4sIHRoZSB1c2VyIGlzIHByb21wdGVkIGFjY29yZGluZyB0 byB0aGUgcHJlZml4IGFyZ3VtZW50LiIKICAgKGludGVyYWN0aXZlICJQIikKICAgKHJlcXVpcmUg J2VkaWZmLXB0Y2gpCiAgIChzZXRxIHBhdGNoLWJ1ZgpAQCAtMTQyMSw3ICsxNDc1LDkgQEAgZWRp ZmYtcmV2aXNpb24KICAgIlJ1biBFZGlmZiBieSBjb21wYXJpbmcgdmVyc2lvbnMgb2YgYSBmaWxl LgogVGhlIGZpbGUgaXMgYW4gb3B0aW9uYWwgRklMRSBhcmd1bWVudCBvciB0aGUgZmlsZSBlbnRl cmVkIGF0IHRoZSBwcm9tcHQuCiBEZWZhdWx0OiB0aGUgZmlsZSB2aXNpdGVkIGJ5IHRoZSBjdXJy ZW50IGJ1ZmZlci4KLVVzZXMgYHZjLmVsJyBvciBgcmNzLmVsJyBkZXBlbmRpbmcgb24gYGVkaWZm LXZlcnNpb24tY29udHJvbC1wYWNrYWdlJy4iCitVc2VzIGB2Yy5lbCcgb3IgYHJjcy5lbCcgZGVw ZW5kaW5nIG9uIGBlZGlmZi12ZXJzaW9uLWNvbnRyb2wtcGFja2FnZScuCitTVEFSVFVQLUhPT0tT IGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVu dHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAgIDs7IGlmIGJ1ZmZlciBp cyBub24tbmlsLCB1c2UgdGhhdCBidWZmZXIgaW5zdGVhZCBvZiB0aGUgY3VycmVudCBidWZmZXIK ICAgKGludGVyYWN0aXZlICJQIikKICAgKGlmIChub3QgKHN0cmluZ3AgZmlsZSkpCkBAIC0xNDM0 LDcgKzE0OTAsNyBAQCBlZGlmZi1yZXZpc2lvbgogCQkJCSduby1kaXJzKSkpCiAgIChmaW5kLWZp bGUgZmlsZSkKICAgKGlmIChhbmQgKGJ1ZmZlci1tb2RpZmllZC1wKQotCSAgICh5LW9yLW4tcCAo Zm9ybWF0ICJCdWZmZXIgJXMgaXMgbW9kaWZpZWQuIFNhdmUgYnVmZmVyPyAiCisJICAgKHktb3It bi1wIChmb3JtYXQgIkJ1ZmZlciAlcyBpcyBtb2RpZmllZC4gIFNhdmUgYnVmZmVyPyAiCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChidWZmZXItbmFtZSkpKSkKICAgICAgIChzYXZlLWJ1 ZmZlciAoY3VycmVudC1idWZmZXIpKSkKICAgKGxldCAocmV2MSByZXYyKQpAQCAtMTUxNyw2ICsx NTczLDcgQEAgZWRpZmYtZG9jdW1lbnRhdGlvbgogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVk aWZmLWZpbGVzLWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLWZpbGVzJyB3aXRoIHRoZSBuZXh0 IHR3byBjb21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUtYSAobnRoIDAgY29t bWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFuZC1saW5lLWFyZ3Mt bGVmdCkpKQogICAgIChzZXRxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQgKG50aGNkciAyIGNvbW1h bmQtbGluZS1hcmdzLWxlZnQpKQpAQCAtMTUyNCw2ICsxNTgxLDcgQEAgZWRpZmYtZmlsZXMtY29t bWFuZAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmMy1maWxlcy1jb21tYW5kICgpCisg ICJDYWxsIGBlZGlmZjMtZmlsZXMnIHdpdGggdGhlIG5leHQgdGhyZWUgY29tbWFuZCBsaW5lIGFy Z3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAwIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQp KQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKQogCShmaWxlLWMgKG50 aCAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkKQEAgLTE1MzIsNiArMTU5MCw3IEBAIGVkaWZm My1maWxlcy1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtbWVyZ2UtY29t bWFuZCAoKQorICAiQ2FsbCBgZWRpZmYtbWVyZ2UtZmlsZXMnIHdpdGggdGhlIG5leHQgdHdvIGNv bW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5kLWxp bmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkp CiAgICAgKHNldHEgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCAobnRoY2RyIDIgY29tbWFuZC1saW5l LWFyZ3MtbGVmdCkpCkBAIC0xNTM5LDYgKzE1OTgsNyBAQCBlZGlmZi1tZXJnZS1jb21tYW5kCiAK IDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtbWVyZ2Utd2l0aC1hbmNlc3Rvci1jb21tYW5k ICgpCisgICJDYWxsIGBlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFuY2VzdG9yJyB3aXRoIHRoZSBu ZXh0IHRocmVlIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGgg MCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUt YXJncy1sZWZ0KSkKIAkoYW5jZXN0b3IgKG50aCAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkK QEAgLTE1NDcsNiArMTYwNyw3IEBAIGVkaWZmLW1lcmdlLXdpdGgtYW5jZXN0b3ItY29tbWFuZAog CiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWRpcmVjdG9yaWVzLWNvbW1hbmQgKCkKKyAg IkNhbGwgYGVkaWZmLWRpcmVjdG9yaWVzJyB3aXRoIHRoZSBuZXh0IHRocmVlIGNvbW1hbmQgbGlu ZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5kLWxpbmUtYXJncy1s ZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkocmVnZXhw IChudGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkpCkBAIC0xNTU1LDYgKzE2MTYsNyBAQCBl ZGlmZi1kaXJlY3Rvcmllcy1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYt ZGlyZWN0b3JpZXMzLWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLWRpcmVjdG9yaWVzMycgd2l0 aCB0aGUgbmV4dCBmb3VyIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1h IChudGggMCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5k LWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1jIChudGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0 KSkKQEAgLTE1NjQsNiArMTYyNiw3IEBAIGVkaWZmLWRpcmVjdG9yaWVzMy1jb21tYW5kCiAKIDs7 OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMtY29tbWFuZCAoKQor ICAiQ2FsbCBgZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMnIHdpdGggdGhlIG5leHQgdGhyZWUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAwIGNvbW1hbmQtbGlu ZS1hcmdzLWxlZnQpKQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKQog CShyZWdleHAgKG50aCAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkKQEAgLTE1NzIsNiArMTYz NSw3IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLWNvbW1hbmQKIAogOzs7IyMjYXV0b2xvYWQK IChkZWZ1biBlZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy13aXRoLWFuY2VzdG9yLWNvbW1hbmQgKCkK KyAgIkNhbGwgYGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLXdpdGgtYW5jZXN0b3InIHdpdGggdGhl IG5leHQgZm91ciBjb21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUtYSAobnRo IDAgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFuZC1saW5l LWFyZ3MtbGVmdCkpCiAJKGFuY2VzdG9yIChudGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkK LS0gCjIuMTQuMQoK --001a113cc362afe4a40559dfc062-- From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Sep 2017 19:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Philipp Stephani Cc: 27764@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150619321818478 (code B ref 27764); Sat, 23 Sep 2017 19:01:01 +0000 Received: (at 27764) by debbugs.gnu.org; 23 Sep 2017 19:00:18 +0000 Received: from localhost ([127.0.0.1]:54897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvpez-0004ny-Ns for submit@debbugs.gnu.org; Sat, 23 Sep 2017 15:00:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvpex-0004ni-LY for 27764@debbugs.gnu.org; Sat, 23 Sep 2017 15:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvpep-0007W9-CG for 27764@debbugs.gnu.org; Sat, 23 Sep 2017 15:00:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvpep-0007W1-8l; Sat, 23 Sep 2017 15:00:07 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3255 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dvpem-0004y6-G2; Sat, 23 Sep 2017 15:00:06 -0400 Date: Sat, 23 Sep 2017 21:59:48 +0300 Message-Id: <83lgl59r6j.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from Philipp Stephani on Sat, 23 Sep 2017 18:46:57 +0000) References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: Philipp Stephani > Date: Sat, 23 Sep 2017 18:46:57 +0000 > > Here's a patch that adds some missing documentation to ediff.el. Thanks. > ;;;###autoload > (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name) > - "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." > + "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. > +STARTUP-HOOKS is a list of functions that Emacs calls without > +arguments after setting up the Ediff buffers. JOB-NAME is a > +symbol describing the Ediff job type; it defaults to > +`ediff-buffers'." Here and elsewhere where JOB-NAME is mentioned, it would be good to have a full list of supported symbols, not just the default one. Otherwise, the patch looks good to me. Thanks for taking good care of this. From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 24 Sep 2017 08:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 27764@debbugs.gnu.org Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150624007225705 (code B ref 27764); Sun, 24 Sep 2017 08:02:02 +0000 Received: (at 27764) by debbugs.gnu.org; 24 Sep 2017 08:01:12 +0000 Received: from localhost ([127.0.0.1]:55137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dw1qi-0006gW-4A for submit@debbugs.gnu.org; Sun, 24 Sep 2017 04:01:12 -0400 Received: from mail-oi0-f45.google.com ([209.85.218.45]:53151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dw1qf-0006gH-Lj for 27764@debbugs.gnu.org; Sun, 24 Sep 2017 04:01:10 -0400 Received: by mail-oi0-f45.google.com with SMTP id p126so3351355oih.9 for <27764@debbugs.gnu.org>; Sun, 24 Sep 2017 01:01:09 -0700 (PDT) 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=kAIHeDFMO78kGrgUIu1xaAYQx1rsNf4mSK6fIMMzWqw=; b=q64AKFEBbDqS9zJAR7k8+0FKm1pr2F9eypAUyDtSXjlN8LvIYWrDDESzEn+dnNNvP/ GrXiZ3Ll86SfQoGLk7qZfbcNJdEf+I7HC3WFq9nzJ/YVsu4mXn6J6wo8wUE1tDEnxwtP 6RPq/HPff56bAwp+QQ9OXBu3cpjjdZOYHY2RwI0oOTE/Il9UzEpxnTcvm3yRJMahjQxG b/GgcWPyGI0EgsuEcdb0wY3T/Gmr4HwpUImY5Mju7etbjuEWPIeYb9PP2HkJXFPzavl6 Eg494vGdScBohRfNrSKa0Uomh3LoBa+o1uskFeJlfvdPH++IJmQ30zlp/e3DX1yHHnBC 5gvQ== 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=kAIHeDFMO78kGrgUIu1xaAYQx1rsNf4mSK6fIMMzWqw=; b=hu+WJWPBuSP/08LkMgGCSXyxw3NKQob9aaAHtUGfQLNdSDNHv0xDnL9FsEyt/RxFuw MkBY0IDllJDSMBPby1vJmHBw0rEmERNLecBgF12FRHRO3cQGScA/6YVOJnPaXNI/Nh6U cNnnSUbqQcfN3yO701A9pf7ZWOL0FToACi0PdITm7SPwMZK9Eycaxh4uCQFZFytiVOns MUVLUsZmWtL33BHBeAFOyfVBxaHexSqxtQiLWAi5uxYs7wbAS85IitUcvuc3QCe+fk8i 8BzUVYoDAvrchETt9Iu/rRB4C1Slm4I10h9uL/a/G/RpDsDRLy+qvP6hKxiEp3Ng9olQ hrIg== X-Gm-Message-State: AHPjjUgcZhxJX8OoXoYxOWKxR1LdsRr90F0RwE8qIZzYl45YsvuhrbhS C1g/vNuQiRui8ekK9ofBeq+aclU8KnmJt3tJtFo= X-Google-Smtp-Source: AOwi7QA3nDHeXAJ6zw4doGnO/EBSeEP5wQIXxmOgKdObxj3zdJ993xiVB2KDkji9Sb4Fd+JWM4NncrIROnuGSM2fIjc= X-Received: by 10.202.171.147 with SMTP id u141mr4447357oie.312.1506240064018; Sun, 24 Sep 2017 01:01:04 -0700 (PDT) MIME-Version: 1.0 References: <83lgl59r6j.fsf@gnu.org> In-Reply-To: <83lgl59r6j.fsf@gnu.org> From: Philipp Stephani Date: Sun, 24 Sep 2017 08:00:53 +0000 Message-ID: Content-Type: multipart/mixed; boundary="001a113cc362f682530559ead7f1" X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) --001a113cc362f682530559ead7f1 Content-Type: multipart/alternative; boundary="001a113cc362f6824e0559ead7ef" --001a113cc362f6824e0559ead7ef Content-Type: text/plain; charset="UTF-8" Eli Zaretskii schrieb am Sa., 23. Sep. 2017 um 21:00 Uhr: > > From: Philipp Stephani > > Date: Sat, 23 Sep 2017 18:46:57 +0000 > > > > Here's a patch that adds some missing documentation to ediff.el. > > Thanks. > > > ;;;###autoload > > (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks > job-name) > > - "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." > > + "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. > > +STARTUP-HOOKS is a list of functions that Emacs calls without > > +arguments after setting up the Ediff buffers. JOB-NAME is a > > +symbol describing the Ediff job type; it defaults to > > +`ediff-buffers'." > > Here and elsewhere where JOB-NAME is mentioned, it would be good to > have a full list of supported symbols, not just the default one. > > I've added some generic text to the docstrings. I have no idea what the full list of supported symbols are and what the point of this argument is in the first place. --001a113cc362f6824e0559ead7ef Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Eli Za= retskii <eliz@gnu.org> schrieb am= Sa., 23. Sep. 2017 um 21:00=C2=A0Uhr:
> From: Philipp Stephani <p.stephani2@gmail.com>
> Date: Sat, 23 Sep 2017 18:46:57 +0000
>
> Here's a patch that adds some missing documentation to ediff.el.
Thanks.

>=C2=A0 ;;;###autoload
>=C2=A0 (defun ediff-buffers (buffer-A buffer-B &optional startup-ho= oks job-name)
> -=C2=A0 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B.&q= uot;
> +=C2=A0 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. > +STARTUP-HOOKS is a list of functions that Emacs calls without
> +arguments after setting up the Ediff buffers.=C2=A0 JOB-NAME is a
> +symbol describing the Ediff job type; it defaults to
> +`ediff-buffers'."

Here and elsewhere where JOB-NAME is mentioned, it would be good to
have a full list of supported symbols, not just the default one.


I've added some generic text to th= e docstrings. I have no idea what the full list of supported symbols are an= d what the point of this argument is in the first place.=C2=A0
<= /div> --001a113cc362f6824e0559ead7ef-- --001a113cc362f682530559ead7f1 Content-Type: text/plain; charset="US-ASCII"; name="0001-Ediff-add-some-missing-documentation.txt" Content-Disposition: attachment; filename="0001-Ediff-add-some-missing-documentation.txt" Content-Transfer-Encoding: base64 Content-ID: <15eb2e72fbd5970ead71> X-Attachment-Id: 15eb2e72fbd5970ead71 RnJvbSAwOTgwNzJjMWI1OTU5YjM0NThmODg1OWQ1MDVhMmNmOTJiYmYxZDM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwIFN0ZXBoYW5pIDxwaHN0QGdvb2dsZS5jb20+CkRh dGU6IFNhdCwgMjMgU2VwIDIwMTcgMjA6NDM6NDQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBFZGlm ZjogYWRkIHNvbWUgbWlzc2luZyBkb2N1bWVudGF0aW9uCgoqIHZjL2VkaWZmLmVsIChlZGlmZi1m aWxlcywgZWRpZmYtZmlsZXMzLCBlZGlmZi1idWZmZXJzKQooZWRpZmYtYnVmZmVyczMsIGVkaWZm LW1lcmdlLWRpcmVjdG9yaWVzKQooZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMtd2l0aC1hbmNlc3Rv cikKKGVkaWZmLW1lcmdlLWRpcmVjdG9yeS1yZXZpc2lvbnMpCihlZGlmZi1tZXJnZS1kaXJlY3Rv cnktcmV2aXNpb25zLXdpdGgtYW5jZXN0b3IpCihlZGlmZi13aW5kb3dzLXdvcmR3aXNlLCBlZGlm Zi13aW5kb3dzLWxpbmV3aXNlKQooZWRpZmYtcmVnaW9ucy13b3Jkd2lzZSwgZWRpZmYtcmVnaW9u cy1saW5ld2lzZSkKKGVkaWZmLW1lcmdlLWZpbGVzLCBlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtYnVmZmVycywgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtcmV2aXNpb25zLCBlZGlmZi1tZXJnZS1yZXZpc2lvbnMtd2l0 aC1hbmNlc3RvcikKKGVkaWZmLXBhdGNoLWZpbGUsIGVkaWZmLXJldmlzaW9uKTogRG9jdW1lbnQg bWlzc2luZyBhcmd1bWVudHMuCihlZGlmZi1wYXRjaC1idWZmZXIsIGVkaWZmLXJldmlzaW9uKTog QWRkIHNlY29uZCBzcGFjZSBhZnRlcgpwZXJpb2QuCihlZGlmZi1maWxlcy1jb21tYW5kLCBlZGlm ZjMtZmlsZXMtY29tbWFuZCwgZWRpZmYtbWVyZ2UtY29tbWFuZCkKKGVkaWZmLW1lcmdlLXdpdGgt YW5jZXN0b3ItY29tbWFuZCwgZWRpZmYtZGlyZWN0b3JpZXMtY29tbWFuZCkKKGVkaWZmLWRpcmVj dG9yaWVzMy1jb21tYW5kLCBlZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy1jb21tYW5kKTogQWRkCmRv Y3VtZW50YXRpb24gZm9yIHRoZSBjb21tYW5kIGxpbmUgZnVuY3Rpb25zLgotLS0KIGxpc3AvdmMv ZWRpZmYuZWwgfCAxMTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkzIGluc2VydGlvbnMoKyksIDI1IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdmMvZWRpZmYuZWwgYi9saXNwL3ZjL2VkaWZmLmVs CmluZGV4IGQwZjhlNjNkY2IuLjk5M2ZmOTM0ZGYgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvZWRpZmYu ZWwKKysrIGIvbGlzcC92Yy9lZGlmZi5lbApAQCAtMTg1LDcgKzE4NSw5IEBAIGVkaWZmLWdldC1k ZWZhdWx0LWZpbGUtbmFtZQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWZpbGVzIChm aWxlLUEgZmlsZS1CICZvcHRpb25hbCBzdGFydHVwLWhvb2tzKQotICAiUnVuIEVkaWZmIG9uIGEg cGFpciBvZiBmaWxlcywgRklMRS1BIGFuZCBGSUxFLUIuIgorICAiUnVuIEVkaWZmIG9uIGEgcGFp ciBvZiBmaWxlcywgRklMRS1BIGFuZCBGSUxFLUIuCitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBv ZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0 dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRp ci1BIChpZiBlZGlmZi11c2UtbGFzdC1kaXIKIAkJICAgIGVkaWZmLWxhc3QtZGlyLUEKQEAgLTIy MSw3ICsyMjMsOSBAQCBlZGlmZi1maWxlcwogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZm LWZpbGVzMyAoZmlsZS1BIGZpbGUtQiBmaWxlLUMgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3MpCi0g ICJSdW4gRWRpZmYgb24gdGhyZWUgZmlsZXMsIEZJTEUtQSwgRklMRS1CLCBhbmQgRklMRS1DLiIK KyAgIlJ1biBFZGlmZiBvbiB0aHJlZSBmaWxlcywgRklMRS1BLCBGSUxFLUIsIGFuZCBGSUxFLUMu CitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3 aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAg IChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChpZiBlZGlmZi11c2UtbGFzdC1kaXIKIAkJ ICAgIGVkaWZmLWxhc3QtZGlyLUEKQEAgLTQxOSw3ICs0MjMsMTIgQEAgZWRpZmYtYmFja3VwCiAK IDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtYnVmZmVycyAoYnVmZmVyLUEgYnVmZmVyLUIg Jm9wdGlvbmFsIHN0YXJ0dXAtaG9va3Mgam9iLW5hbWUpCi0gICJSdW4gRWRpZmYgb24gYSBwYWly IG9mIGJ1ZmZlcnMsIEJVRkZFUi1BIGFuZCBCVUZGRVItQi4iCisgICJSdW4gRWRpZmYgb24gYSBw YWlyIG9mIGJ1ZmZlcnMsIEJVRkZFUi1BIGFuZCBCVUZGRVItQi4KK1NUQVJUVVAtSE9PS1MgaXMg YSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQKK2FyZ3VtZW50cyBh ZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYQorc3ltYm9s IGRlc2NyaWJpbmcgdGhlIEVkaWZmIGpvYiB0eXBlOyBpdCBkZWZhdWx0cyB0bworYGVkaWZmLWJ1 ZmZlcnMnLCBidXQgY2FuIGFsc28gYmUgb25lIG9mIHRoZSBvdGhlciBgZWRpZmYnCitmdW5jdGlv biBzeW1ib2xzLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0IChiZikKICAgICAgKGxpc3QgKHNl dHEgYmYgKHJlYWQtYnVmZmVyICJCdWZmZXIgQSB0byBjb21wYXJlOiAiCkBAIC00NDEsNyArNDUw LDEyIEBAICdlYnVmZmVycwogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZi1idWZmZXJzMyAo YnVmZmVyLUEgYnVmZmVyLUIgYnVmZmVyLUMKIAkJCQkgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3Mg am9iLW5hbWUpCi0gICJSdW4gRWRpZmYgb24gdGhyZWUgYnVmZmVycywgQlVGRkVSLUEsIEJVRkZF Ui1CLCBhbmQgQlVGRkVSLUMuIgorICAiUnVuIEVkaWZmIG9uIHRocmVlIGJ1ZmZlcnMsIEJVRkZF Ui1BLCBCVUZGRVItQiwgYW5kIEJVRkZFUi1DLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2Yg ZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRp bmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuICBKT0ItTkFNRSBpcyBhCitzeW1ib2wgZGVzY3JpYmlu ZyB0aGUgRWRpZmYgam9iIHR5cGU7IGl0IGRlZmF1bHRzIHRvCitgZWRpZmYtYnVmZmVyczMnLCBi dXQgY2FuIGFsc28gYmUgb25lIG9mIHRoZSBvdGhlciBgZWRpZmYnCitmdW5jdGlvbiBzeW1ib2xz LiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0IChiZiBiZmYpCiAgICAgIChsaXN0IChzZXRxIGJm IChyZWFkLWJ1ZmZlciAiQnVmZmVyIEEgdG8gY29tcGFyZTogIgpAQCAtNjM3LDcgKzY1MSw4IEBA ICdlZGlyczMKIChkZWZ1biBlZGlmZi1tZXJnZS1kaXJlY3RvcmllcyAoZGlyMSBkaXIyIHJlZ2V4 cCAmb3B0aW9uYWwgbWVyZ2UtYXV0b3N0b3JlLWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIHBhaXIg b2YgZGlyZWN0b3JpZXMsIERJUjEgYW5kIERJUjIsIG1lcmdpbmcgZmlsZXMgdGhhdCBoYXZlCiB0 aGUgc2FtZSBuYW1lIGluIGJvdGguICBUaGUgdGhpcmQgYXJndW1lbnQsIFJFR0VYUCwgaXMgbmls IG9yIGEgcmVndWxhcgotZXhwcmVzc2lvbjsgb25seSBmaWxlIG5hbWVzIHRoYXQgbWF0Y2ggdGhl IHJlZ2V4cCBhcmUgY29uc2lkZXJlZC4iCitleHByZXNzaW9uOyBvbmx5IGZpbGUgbmFtZXMgdGhh dCBtYXRjaCB0aGUgcmVnZXhwIGFyZSBjb25zaWRlcmVkLgorTUVSR0UtQVVUT1NUT1JFLURJUiBp cyB0aGUgZGlyZWN0b3J5IGluIHdoaWNoIHRvIHN0b3JlIG1lcmdlZCBmaWxlcy4iCiAgIChpbnRl cmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChlZGlmZi1nZXQtZGVmYXVsdC1kaXJlY3RvcnktbmFt ZSkpCiAJIChkZWZhdWx0LXJlZ2V4cCAoZXZhbCBlZGlmZi1kZWZhdWx0LWZpbHRlcmluZy1yZWdl eHApKQpAQCAtNjc0LDcgKzY4OSw4IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLXdpdGgtYW5j ZXN0b3IKIEVkaWZmIG1lcmdlcyBmaWxlcyB0aGF0IGhhdmUgaWRlbnRpY2FsIG5hbWVzIGluIERJ UjEsIERJUjIuICBJZiBhIHBhaXIgb2YgZmlsZXMKIGluIERJUjEgYW5kIERJUjIgZG9lc24ndCBo YXZlIGFuIGFuY2VzdG9yIGluIEFOQ0VTVE9SLURJUiwgRWRpZmYgd2lsbCBtZXJnZQogd2l0aG91 dCBhbmNlc3Rvci4gIFRoZSBmb3VydGggYXJndW1lbnQsIFJFR0VYUCwgaXMgbmlsIG9yIGEgcmVn dWxhciBleHByZXNzaW9uOwotb25seSBmaWxlIG5hbWVzIHRoYXQgbWF0Y2ggdGhlIHJlZ2V4cCBh cmUgY29uc2lkZXJlZC4iCitvbmx5IGZpbGUgbmFtZXMgdGhhdCBtYXRjaCB0aGUgcmVnZXhwIGFy ZSBjb25zaWRlcmVkLgorTUVSR0UtQVVUT1NUT1JFLURJUiBpcyB0aGUgZGlyZWN0b3J5IGluIHdo aWNoIHRvIHN0b3JlIG1lcmdlZCBmaWxlcy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRp ci1BIChlZGlmZi1nZXQtZGVmYXVsdC1kaXJlY3RvcnktbmFtZSkpCiAJIChkZWZhdWx0LXJlZ2V4 cCAoZXZhbCBlZGlmZi1kZWZhdWx0LWZpbHRlcmluZy1yZWdleHApKQpAQCAtNzEwLDcgKzcyNiw4 IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yeS1yZXZpc2lvbnMKIAkJCQkJICAgICAmb3B0aW9uYWwg bWVyZ2UtYXV0b3N0b3JlLWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIGRpcmVjdG9yeSwgRElSMSwg bWVyZ2luZyBpdHMgZmlsZXMgd2l0aCB0aGVpciByZXZpc2lvbnMuCiBUaGUgc2Vjb25kIGFyZ3Vt ZW50LCBSRUdFWFAsIGlzIGEgcmVndWxhciBleHByZXNzaW9uIHRoYXQgZmlsdGVycyB0aGUgZmls ZQotbmFtZXMuICBPbmx5IHRoZSBmaWxlcyB0aGF0IGFyZSB1bmRlciByZXZpc2lvbiBjb250cm9s IGFyZSB0YWtlbiBpbnRvIGFjY291bnQuIgorbmFtZXMuICBPbmx5IHRoZSBmaWxlcyB0aGF0IGFy ZSB1bmRlciByZXZpc2lvbiBjb250cm9sIGFyZSB0YWtlbiBpbnRvIGFjY291bnQuCitNRVJHRS1B VVRPU1RPUkUtRElSIGlzIHRoZSBkaXJlY3RvcnkgaW4gd2hpY2ggdG8gc3RvcmUgbWVyZ2VkIGZp bGVzLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0ICgoZGlyLUEgKGVkaWZmLWdldC1kZWZhdWx0 LWRpcmVjdG9yeS1uYW1lKSkKIAkgKGRlZmF1bHQtcmVnZXhwIChldmFsIGVkaWZmLWRlZmF1bHQt ZmlsdGVyaW5nLXJlZ2V4cCkpCkBAIC03NDAsNyArNzU3LDggQEAgZWRpZmYtbWVyZ2UtZGlyZWN0 b3J5LXJldmlzaW9ucy13aXRoLWFuY2VzdG9yCiAJCQkJCQkJICAgbWVyZ2UtYXV0b3N0b3JlLWRp cikKICAgIlJ1biBFZGlmZiBvbiBhIGRpcmVjdG9yeSwgRElSMSwgbWVyZ2luZyBpdHMgZmlsZXMg d2l0aCB0aGVpciByZXZpc2lvbnMgYW5kIGFuY2VzdG9ycy4KIFRoZSBzZWNvbmQgYXJndW1lbnQs IFJFR0VYUCwgaXMgYSByZWd1bGFyIGV4cHJlc3Npb24gdGhhdCBmaWx0ZXJzIHRoZSBmaWxlCi1u YW1lcy4gIE9ubHkgdGhlIGZpbGVzIHRoYXQgYXJlIHVuZGVyIHJldmlzaW9uIGNvbnRyb2wgYXJl IHRha2VuIGludG8gYWNjb3VudC4iCituYW1lcy4gIE9ubHkgdGhlIGZpbGVzIHRoYXQgYXJlIHVu ZGVyIHJldmlzaW9uIGNvbnRyb2wgYXJlIHRha2VuIGludG8gYWNjb3VudC4KK01FUkdFLUFVVE9T VE9SRS1ESVIgaXMgdGhlIGRpcmVjdG9yeSBpbiB3aGljaCB0byBzdG9yZSBtZXJnZWQgZmlsZXMu IgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChkaXItQSAoZWRpZmYtZ2V0LWRlZmF1bHQtZGly ZWN0b3J5LW5hbWUpKQogCSAoZGVmYXVsdC1yZWdleHAgKGV2YWwgZWRpZmYtZGVmYXVsdC1maWx0 ZXJpbmctcmVnZXhwKSkKQEAgLTkwOCw3ICs5MjYsOSBAQCBlZGlmZi13aW5kb3dzLXdvcmR3aXNl CiBXaXRoIHByZWZpeCBhcmd1bWVudCwgRFVNQi1NT0RFLCBvciBvbiBhIG5vbi13aW5kb3dpbmcg ZGlzcGxheSwgd29ya3MgYXMKIGZvbGxvd3M6CiBJZiBXSU5ELUEgaXMgbmlsLCB1c2Ugc2VsZWN0 ZWQgd2luZG93LgotSWYgV0lORC1CIGlzIG5pbCwgdXNlIHdpbmRvdyBuZXh0IHRvIFdJTkQtQS4i CitJZiBXSU5ELUIgaXMgbmlsLCB1c2Ugd2luZG93IG5leHQgdG8gV0lORC1BLgorU1RBUlRVUC1I T09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJn dW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3Rp dmUgIlAiKQogICAoZWRpZmYtd2luZG93cyBkdW1iLW1vZGUgd2luZC1BIHdpbmQtQgogCQkgc3Rh cnR1cC1ob29rcyAnZWRpZmYtd2luZG93cy13b3Jkd2lzZSAnd29yZC1tb2RlKSkKQEAgLTkxOSw3 ICs5MzksOSBAQCBlZGlmZi13aW5kb3dzLWxpbmV3aXNlCiBXaXRoIHByZWZpeCBhcmd1bWVudCwg RFVNQi1NT0RFLCBvciBvbiBhIG5vbi13aW5kb3dpbmcgZGlzcGxheSwgd29ya3MgYXMKIGZvbGxv d3M6CiBJZiBXSU5ELUEgaXMgbmlsLCB1c2Ugc2VsZWN0ZWQgd2luZG93LgotSWYgV0lORC1CIGlz IG5pbCwgdXNlIHdpbmRvdyBuZXh0IHRvIFdJTkQtQS4iCitJZiBXSU5ELUIgaXMgbmlsLCB1c2Ug d2luZG93IG5leHQgdG8gV0lORC1BLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rp b25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAg dGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUgIlAiKQogICAoZWRpZmYtd2luZG93 cyBkdW1iLW1vZGUgd2luZC1BIHdpbmQtQgogCQkgc3RhcnR1cC1ob29rcyAnZWRpZmYtd2luZG93 cy1saW5ld2lzZSBuaWwpKQpAQCAtOTYzLDkgKzk4NSwxMiBAQCBlZGlmZi13aW5kb3dzCiA7Ozsj IyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLXJlZ2lvbnMtd29yZHdpc2UgKGJ1ZmZlci1BIGJ1ZmZl ci1CICZvcHRpb25hbCBzdGFydHVwLWhvb2tzKQogICAiUnVuIEVkaWZmIG9uIGEgcGFpciBvZiBy ZWdpb25zIGluIHNwZWNpZmllZCBidWZmZXJzLgorQlVGRkVSLUEgYW5kIEJVRkZFUi1CIGFyZSB0 aGUgYnVmZmVycyB0byBiZSBjb21wYXJlZC4KIFJlZ2lvbnMgKGkuZS4sIHBvaW50IGFuZCBtYXJr KSBjYW4gYmUgc2V0IGluIGFkdmFuY2Ugb3IgbWFya2VkIGludGVyYWN0aXZlbHkuCiBUaGlzIGZ1 bmN0aW9uIGlzIGVmZmVjdGl2ZSBvbmx5IGZvciByZWxhdGl2ZWx5IHNtYWxsIHJlZ2lvbnMsIHVw IHRvIDIwMAotbGluZXMuICBGb3IgbGFyZ2UgcmVnaW9ucywgdXNlIGBlZGlmZi1yZWdpb25zLWxp bmV3aXNlJy4iCitsaW5lcy4gIEZvciBsYXJnZSByZWdpb25zLCB1c2UgYGVkaWZmLXJlZ2lvbnMt bGluZXdpc2UnLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1h Y3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1 ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKGJmKQogICAgICAobGlzdCAoc2V0cSBi ZiAocmVhZC1idWZmZXIgIlJlZ2lvbidzIEEgYnVmZmVyOiAiCkBAIC0xMDAzLDEwICsxMDI4LDEz IEBAIGVkaWZmLXJlZ2lvbnMtd29yZHdpc2UKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYt cmVnaW9ucy1saW5ld2lzZSAoYnVmZmVyLUEgYnVmZmVyLUIgJm9wdGlvbmFsIHN0YXJ0dXAtaG9v a3MpCiAgICJSdW4gRWRpZmYgb24gYSBwYWlyIG9mIHJlZ2lvbnMgaW4gc3BlY2lmaWVkIGJ1ZmZl cnMuCitCVUZGRVItQSBhbmQgQlVGRkVSLUIgYXJlIHRoZSBidWZmZXJzIHRvIGJlIGNvbXBhcmVk LgogUmVnaW9ucyAoaS5lLiwgcG9pbnQgYW5kIG1hcmspIGNhbiBiZSBzZXQgaW4gYWR2YW5jZSBv ciBtYXJrZWQgaW50ZXJhY3RpdmVseS4KIEVhY2ggcmVnaW9uIGlzIGVubGFyZ2VkIHRvIGNvbnRh aW4gZnVsbCBsaW5lcy4KIFRoaXMgZnVuY3Rpb24gaXMgZWZmZWN0aXZlIGZvciBsYXJnZSByZWdp b25zLCBvdmVyIDEwMC0yMDAKLWxpbmVzLiAgRm9yIHNtYWxsIHJlZ2lvbnMsIHVzZSBgZWRpZmYt cmVnaW9ucy13b3Jkd2lzZScuIgorbGluZXMuICBGb3Igc21hbGwgcmVnaW9ucywgdXNlIGBlZGlm Zi1yZWdpb25zLXdvcmR3aXNlJy4KK1NUQVJUVVAtSE9PS1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9u cyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQKK2FyZ3VtZW50cyBhZnRlciBzZXR0aW5nIHVwIHRo ZSBFZGlmZiBidWZmZXJzLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0IChiZikKICAgICAgKGxp c3QgKHNldHEgYmYgKHJlYWQtYnVmZmVyICJSZWdpb24gQSdzIGJ1ZmZlcjogIgpAQCAtMTEyNyw3 ICsxMTU1LDExIEBAIGVkaWZmLW1lcmdlLWZpbGVzCiAJCQkJIDs7IE1FUkdFLUJVRkZFUi1GSUxF IGlzIHRoZSBmaWxlIHRvIGJlCiAJCQkJIDs7IGFzc29jaWF0ZWQgd2l0aCB0aGUgbWVyZ2UgYnVm ZmVyCiAJCQkJICZvcHRpb25hbCBzdGFydHVwLWhvb2tzIG1lcmdlLWJ1ZmZlci1maWxlKQotICAi TWVyZ2UgdHdvIGZpbGVzIHdpdGhvdXQgYW5jZXN0b3IuIgorICAiTWVyZ2UgdHdvIGZpbGVzIHdp dGhvdXQgYW5jZXN0b3IuCitGSUxFLUEgYW5kIEZJTEUtQiBhcmUgdGhlIG5hbWVzIG9mIHRoZSBm aWxlcyB0byBiZSBtZXJnZWQuCitTVEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMg dGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUg RWRpZmYgYnVmZmVycy4gIE1FUkdFLUJVRkZFUi1GSUxFCitpcyB0aGUgbmFtZSBvZiB0aGUgZmls ZSB0byBiZSBhc3NvY2lhdGVkIHdpdGggdGhlIG1lcmdlIGJ1ZmZlci4uIgogICAoaW50ZXJhY3Rp dmUKICAgIChsZXQgKChkaXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1s YXN0LWRpci1BCkBAIC0xMTcxLDcgKzEyMDMsMTIgQEAgZWRpZmYtbWVyZ2UtZmlsZXMtd2l0aC1h bmNlc3RvcgogCQkJCQkgICAgICAgOzsgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZQogCQkJCQkg ICAgICAgOzsgbWVyZ2UgYnVmZmVyCiAJCQkJCSAgICAgICBtZXJnZS1idWZmZXItZmlsZSkKLSAg Ik1lcmdlIHR3byBmaWxlcyB3aXRoIGFuY2VzdG9yLiIKKyAgIk1lcmdlIHR3byBmaWxlcyB3aXRo IGFuY2VzdG9yLgorRklMRS1BIGFuZCBGSUxFLUIgYXJlIHRoZSBuYW1lcyBvZiB0aGUgZmlsZXMg dG8gYmUgbWVyZ2VkLCBhbmQKK0ZJTEUtQU5DRVNUT1IgaXMgdGhlIG5hbWUgb2YgdGhlIGFuY2Vz dG9yIGZpbGUuICBTVEFSVFVQLUhPT0tTIGlzCithIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1h Y3MgY2FsbHMgd2l0aG91dCBhcmd1bWVudHMgYWZ0ZXIKK3NldHRpbmcgdXAgdGhlIEVkaWZmIGJ1 ZmZlcnMuICBNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZgordGhlIGZpbGUgdG8gYmUg YXNzb2NpYXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAgIChs ZXQgKChkaXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRpci1B CkBAIC0xMjI5LDcgKzEyNjYsMTQgQEAgZWRpZmYtbWVyZ2UtYnVmZmVycwogCQkJCSAgICAgOzsg TUVSR0UtQlVGRkVSLUZJTEUgaXMgdGhlIGZpbGUgdG8gYmUKIAkJCQkgICAgIDs7IGFzc29jaWF0 ZWQgd2l0aCB0aGUgbWVyZ2UgYnVmZmVyCiAJCQkJICAgICBzdGFydHVwLWhvb2tzIGpvYi1uYW1l IG1lcmdlLWJ1ZmZlci1maWxlKQotICAiTWVyZ2UgYnVmZmVycyB3aXRob3V0IGFuY2VzdG9yLiIK KyAgIk1lcmdlIGJ1ZmZlcnMgd2l0aG91dCBhbmNlc3Rvci4KK0JVRkZFUi1BIGFuZCBCVUZGRVIt QiBhcmUgdGhlIGJ1ZmZlcnMgdG8gYmUgbWVyZ2VkLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qg b2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNl dHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuICBKT0ItTkFNRSBpcyBhCitzeW1ib2wgZGVzY3Jp YmluZyB0aGUgRWRpZmYgam9iIHR5cGU7IGl0IGRlZmF1bHRzIHRvCitgZWRpZmYtbWVyZ2UtYnVm ZmVycycsIGJ1dCBjYW4gYWxzbyBiZSBvbmUgb2YgdGhlIG90aGVyIGBlZGlmZicKK2Z1bmN0aW9u IHN5bWJvbHMuICBNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZSB0bwor YmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAg IChsZXQgKGJmKQogICAgICAobGlzdCAoc2V0cSBiZiAocmVhZC1idWZmZXIgIkJ1ZmZlciBBIHRv IG1lcmdlOiAiCkBAIC0xMjU2LDcgKzEzMDAsMTUgQEAgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRo LWFuY2VzdG9yCiAJCQkJCQkgICA7OyBmaWxlIHRvIGJlIGFzc29jaWF0ZWQKIAkJCQkJCSAgIDs7 IHdpdGggdGhlIG1lcmdlIGJ1ZmZlcgogCQkJCQkJICAgbWVyZ2UtYnVmZmVyLWZpbGUpCi0gICJN ZXJnZSBidWZmZXJzIHdpdGggYW5jZXN0b3IuIgorICAiTWVyZ2UgYnVmZmVycyB3aXRoIGFuY2Vz dG9yLgorQlVGRkVSLUEgYW5kIEJVRkZFUi1CIGFyZSB0aGUgYnVmZmVycyB0byBiZSBtZXJnZWQs IGFuZAorQlVGRkVSLUFOQ0VTVE9SIGlzIHRoZWlyIGFuY2VzdG9yLiAgU1RBUlRVUC1IT09LUyBp cyBhIGxpc3Qgb2YKK2Z1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQgYXJndW1lbnRz IGFmdGVyIHNldHRpbmcgdXAgdGhlCitFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYSBzeW1i b2wgZGVzY3JpYmluZyB0aGUgRWRpZmYgam9iCit0eXBlOyBpdCBkZWZhdWx0cyB0byBgZWRpZmYt bWVyZ2UtYnVmZmVycy13aXRoLWFuY2VzdG9yJywgYnV0IGNhbgorYWxzbyBiZSBvbmUgb2YgdGhl IG90aGVyIGBlZGlmZicgZnVuY3Rpb24gc3ltYm9scy4KK01FUkdFLUJVRkZFUi1GSUxFIGlzIHRo ZSBuYW1lIG9mIHRoZSBmaWxlIHRvIGJlIGFzc29jaWF0ZWQgd2l0aAordGhlIG1lcmdlIGJ1ZmZl ci4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoYmYgYmZmKQogICAgICAobGlzdCAoc2V0cSBi ZiAocmVhZC1idWZmZXIgIkJ1ZmZlciBBIHRvIG1lcmdlOiAiCkBAIC0xMjg3LDggKzEzMzksMTEg QEAgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFuY2VzdG9yCiAoZGVmdW4gZWRpZmYtbWVyZ2Ut cmV2aXNpb25zICgmb3B0aW9uYWwgZmlsZSBzdGFydHVwLWhvb2tzIG1lcmdlLWJ1ZmZlci1maWxl KQogICA7OyBNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgZmlsZSB0byBiZSBhc3NvY2lhdGVkIHdp dGggdGhlIG1lcmdlIGJ1ZmZlcgogICAiUnVuIEVkaWZmIGJ5IG1lcmdpbmcgdHdvIHJldmlzaW9u cyBvZiBhIGZpbGUuCi1UaGUgZmlsZSBpcyB0aGUgb3B0aW9uYWwgRklMRSBhcmd1bWVudCBvciB0 aGUgZmlsZSB2aXNpdGVkIGJ5IHRoZSBjdXJyZW50Ci1idWZmZXIuIgorVGhlIGZpbGUgaXMgdGhl IG9wdGlvbmFsIEZJTEUgYXJndW1lbnQgb3IgdGhlIGZpbGUgdmlzaXRlZCBieSB0aGUKK2N1cnJl bnQgYnVmZmVyLiAgU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1h Y3MKK2NhbGxzIHdpdGhvdXQgYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1 ZmZlcnMuCitNRVJHRS1CVUZGRVItRklMRSBpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZSB0byBiZSBh c3NvY2lhdGVkIHdpdGgKK3RoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUpCiAgIChp ZiAoc3RyaW5ncCBmaWxlKSAoZmluZC1maWxlIGZpbGUpKQogICAobGV0IChyZXYxIHJldjIpCkBA IC0xMzE5LDggKzEzNzQsMTEgQEAgZWRpZmYtbWVyZ2UtcmV2aXNpb25zLXdpdGgtYW5jZXN0b3IK IAkJCQkJICAgIDs7IGJ1ZmZlcgogCQkJCQkgICAgbWVyZ2UtYnVmZmVyLWZpbGUpCiAgICJSdW4g RWRpZmYgYnkgbWVyZ2luZyB0d28gcmV2aXNpb25zIG9mIGEgZmlsZSB3aXRoIGEgY29tbW9uIGFu Y2VzdG9yLgotVGhlIGZpbGUgaXMgdGhlIG9wdGlvbmFsIEZJTEUgYXJndW1lbnQgb3IgdGhlIGZp bGUgdmlzaXRlZCBieSB0aGUgY3VycmVudAotYnVmZmVyLiIKK1RoZSBmaWxlIGlzIHRoZSBvcHRp b25hbCBGSUxFIGFyZ3VtZW50IG9yIHRoZSBmaWxlIHZpc2l0ZWQgYnkgdGhlCitjdXJyZW50IGJ1 ZmZlci4gIFNUQVJUVVAtSE9PS1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzCitj YWxscyB3aXRob3V0IGFyZ3VtZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJz LgorTUVSR0UtQlVGRkVSLUZJTEUgaXMgdGhlIG5hbWUgb2YgdGhlIGZpbGUgdG8gYmUgYXNzb2Np YXRlZCB3aXRoCit0aGUgbWVyZ2UgYnVmZmVyLiIKICAgKGludGVyYWN0aXZlKQogICAoaWYgKHN0 cmluZ3AgZmlsZSkgKGZpbmQtZmlsZSBmaWxlKSkKICAgKGxldCAocmV2MSByZXYyIGFuY2VzdG9y LXJldikKQEAgLTEzNjAsOCArMTQxOCw4IEBAIGVkaWZmLXBhdGNoLWZpbGUKICAgIlF1ZXJ5IGZv ciBhIGZpbGUgbmFtZSwgYW5kIHRoZW4gcnVuIEVkaWZmIGJ5IHBhdGNoaW5nIHRoYXQgZmlsZS4K IElmIG9wdGlvbmFsIFBBVENILUJVRiBpcyBnaXZlbiwgdXNlIHRoZSBwYXRjaCBpbiB0aGF0IGJ1 ZmZlcgogYW5kIGRvbid0IGFzayB0aGUgdXNlci4KLUlmIHByZWZpeCBhcmd1bWVudCwgdGhlbjog aWYgZXZlbiBhcmd1bWVudCwgYXNzdW1lIHRoYXQgdGhlIHBhdGNoIGlzIGluIGEKLWJ1ZmZlci4g SWYgb2RkIC0tIGFzc3VtZSBpdCBpcyBpbiBhIGZpbGUuIgorSWYgcHJlZml4IGFyZ3VtZW50IEFS RywgdGhlbjogaWYgZXZlbiBhcmd1bWVudCwgYXNzdW1lIHRoYXQgdGhlCitwYXRjaCBpcyBpbiBh IGJ1ZmZlci4gIElmIG9kZCAtLSBhc3N1bWUgaXQgaXMgaW4gYSBmaWxlLiIKICAgKGludGVyYWN0 aXZlICJQIikKICAgKGxldCAoc291cmNlLWRpciBzb3VyY2UtZmlsZSkKICAgICAocmVxdWlyZSAn ZWRpZmYtcHRjaCkKQEAgLTEzOTQsNyArMTQ1Miw3IEBAIGVkaWZmLXBhdGNoLWJ1ZmZlcgogV2l0 aCBBUkc9MSwgYXNzdW1lcyB0aGUgcGF0Y2ggaXMgaW4gYSBmaWxlIGFuZCBwcm9tcHRzIGZvciB0 aGUgZmlsZS4KIFdpdGggQVJHPTIsIGFzc3VtZXMgdGhlIHBhdGNoIGlzIGluIGEgYnVmZmVyIGFu ZCBwcm9tcHRzIGZvciB0aGUgYnVmZmVyLgogUEFUQ0gtQlVGIGlzIGFuIG9wdGlvbmFsIGFyZ3Vt ZW50LCB3aGljaCBzcGVjaWZpZXMgdGhlIGJ1ZmZlciB0aGF0IGNvbnRhaW5zIHRoZQotcGF0Y2gu IElmIG5vdCBnaXZlbiwgdGhlIHVzZXIgaXMgcHJvbXB0ZWQgYWNjb3JkaW5nIHRvIHRoZSBwcmVm aXggYXJndW1lbnQuIgorcGF0Y2guICBJZiBub3QgZ2l2ZW4sIHRoZSB1c2VyIGlzIHByb21wdGVk IGFjY29yZGluZyB0byB0aGUgcHJlZml4IGFyZ3VtZW50LiIKICAgKGludGVyYWN0aXZlICJQIikK ICAgKHJlcXVpcmUgJ2VkaWZmLXB0Y2gpCiAgIChzZXRxIHBhdGNoLWJ1ZgpAQCAtMTQyMSw3ICsx NDc5LDkgQEAgZWRpZmYtcmV2aXNpb24KICAgIlJ1biBFZGlmZiBieSBjb21wYXJpbmcgdmVyc2lv bnMgb2YgYSBmaWxlLgogVGhlIGZpbGUgaXMgYW4gb3B0aW9uYWwgRklMRSBhcmd1bWVudCBvciB0 aGUgZmlsZSBlbnRlcmVkIGF0IHRoZSBwcm9tcHQuCiBEZWZhdWx0OiB0aGUgZmlsZSB2aXNpdGVk IGJ5IHRoZSBjdXJyZW50IGJ1ZmZlci4KLVVzZXMgYHZjLmVsJyBvciBgcmNzLmVsJyBkZXBlbmRp bmcgb24gYGVkaWZmLXZlcnNpb24tY29udHJvbC1wYWNrYWdlJy4iCitVc2VzIGB2Yy5lbCcgb3Ig YHJjcy5lbCcgZGVwZW5kaW5nIG9uIGBlZGlmZi12ZXJzaW9uLWNvbnRyb2wtcGFja2FnZScuCitT VEFSVFVQLUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRo b3V0Cithcmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4iCiAgIDs7 IGlmIGJ1ZmZlciBpcyBub24tbmlsLCB1c2UgdGhhdCBidWZmZXIgaW5zdGVhZCBvZiB0aGUgY3Vy cmVudCBidWZmZXIKICAgKGludGVyYWN0aXZlICJQIikKICAgKGlmIChub3QgKHN0cmluZ3AgZmls ZSkpCkBAIC0xNDM0LDcgKzE0OTQsNyBAQCBlZGlmZi1yZXZpc2lvbgogCQkJCSduby1kaXJzKSkp CiAgIChmaW5kLWZpbGUgZmlsZSkKICAgKGlmIChhbmQgKGJ1ZmZlci1tb2RpZmllZC1wKQotCSAg ICh5LW9yLW4tcCAoZm9ybWF0ICJCdWZmZXIgJXMgaXMgbW9kaWZpZWQuIFNhdmUgYnVmZmVyPyAi CisJICAgKHktb3Itbi1wIChmb3JtYXQgIkJ1ZmZlciAlcyBpcyBtb2RpZmllZC4gIFNhdmUgYnVm ZmVyPyAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChidWZmZXItbmFtZSkpKSkKICAg ICAgIChzYXZlLWJ1ZmZlciAoY3VycmVudC1idWZmZXIpKSkKICAgKGxldCAocmV2MSByZXYyKQpA QCAtMTUxNyw2ICsxNTc3LDcgQEAgZWRpZmYtZG9jdW1lbnRhdGlvbgogCiA7OzsjIyNhdXRvbG9h ZAogKGRlZnVuIGVkaWZmLWZpbGVzLWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLWZpbGVzJyB3 aXRoIHRoZSBuZXh0IHR3byBjb21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUt YSAobnRoIDAgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFu ZC1saW5lLWFyZ3MtbGVmdCkpKQogICAgIChzZXRxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQgKG50 aGNkciAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKQpAQCAtMTUyNCw2ICsxNTg1LDcgQEAgZWRp ZmYtZmlsZXMtY29tbWFuZAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmMy1maWxlcy1j b21tYW5kICgpCisgICJDYWxsIGBlZGlmZjMtZmlsZXMnIHdpdGggdGhlIG5leHQgdGhyZWUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAwIGNvbW1hbmQtbGlu ZS1hcmdzLWxlZnQpKQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKQog CShmaWxlLWMgKG50aCAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkKQEAgLTE1MzIsNiArMTU5 NCw3IEBAIGVkaWZmMy1maWxlcy1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRp ZmYtbWVyZ2UtY29tbWFuZCAoKQorICAiQ2FsbCBgZWRpZmYtbWVyZ2UtZmlsZXMnIHdpdGggdGhl IG5leHQgdHdvIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGgg MCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUt YXJncy1sZWZ0KSkpCiAgICAgKHNldHEgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCAobnRoY2RyIDIg Y29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCkBAIC0xNTM5LDYgKzE2MDIsNyBAQCBlZGlmZi1tZXJn ZS1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtbWVyZ2Utd2l0aC1hbmNl c3Rvci1jb21tYW5kICgpCisgICJDYWxsIGBlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFuY2VzdG9y JyB3aXRoIHRoZSBuZXh0IHRocmVlIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgo ZmlsZS1hIChudGggMCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBj b21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoYW5jZXN0b3IgKG50aCAyIGNvbW1hbmQtbGluZS1h cmdzLWxlZnQpKSkKQEAgLTE1NDcsNiArMTYxMSw3IEBAIGVkaWZmLW1lcmdlLXdpdGgtYW5jZXN0 b3ItY29tbWFuZAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWRpcmVjdG9yaWVzLWNv bW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLWRpcmVjdG9yaWVzJyB3aXRoIHRoZSBuZXh0IHRocmVl IGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5k LWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0 KSkKIAkocmVnZXhwIChudGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkpCkBAIC0xNTU1LDYg KzE2MjAsNyBAQCBlZGlmZi1kaXJlY3Rvcmllcy1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAo ZGVmdW4gZWRpZmYtZGlyZWN0b3JpZXMzLWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLWRpcmVj dG9yaWVzMycgd2l0aCB0aGUgbmV4dCBmb3VyIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgogICAo bGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1iIChu dGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1jIChudGggMiBjb21tYW5kLWxp bmUtYXJncy1sZWZ0KSkKQEAgLTE1NjQsNiArMTYzMCw3IEBAIGVkaWZmLWRpcmVjdG9yaWVzMy1j b21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMt Y29tbWFuZCAoKQorICAiQ2FsbCBgZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMnIHdpdGggdGhlIG5l eHQgdGhyZWUgY29tbWFuZCBsaW5lIGFyZ3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAw IGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1h cmdzLWxlZnQpKQogCShyZWdleHAgKG50aCAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkKQEAg LTE1NzIsNiArMTYzOSw3IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLWNvbW1hbmQKIAogOzs7 IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy13aXRoLWFuY2VzdG9y LWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLXdpdGgtYW5jZXN0 b3InIHdpdGggdGhlIG5leHQgZm91ciBjb21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAo KGZpbGUtYSAobnRoIDAgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEg Y29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGFuY2VzdG9yIChudGggMiBjb21tYW5kLWxpbmUt YXJncy1sZWZ0KSkKLS0gCjIuMTQuMQoK --001a113cc362f682530559ead7f1-- From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 29 Sep 2017 07:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Philipp Stephani Cc: 27764@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150666948819603 (code B ref 27764); Fri, 29 Sep 2017 07:19:02 +0000 Received: (at 27764) by debbugs.gnu.org; 29 Sep 2017 07:18:08 +0000 Received: from localhost ([127.0.0.1]:37479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxpYm-000566-8W for submit@debbugs.gnu.org; Fri, 29 Sep 2017 03:18:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxpYk-00055c-E9 for 27764@debbugs.gnu.org; Fri, 29 Sep 2017 03:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxpYc-0003gt-0S for 27764@debbugs.gnu.org; Fri, 29 Sep 2017 03:18:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxpYb-0003gp-TV; Fri, 29 Sep 2017 03:17:57 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4917 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dxpYb-0001AY-AY; Fri, 29 Sep 2017 03:17:57 -0400 Date: Fri, 29 Sep 2017 10:17:49 +0300 Message-Id: <83bmlu9dnm.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from Philipp Stephani on Sun, 24 Sep 2017 08:00:53 +0000) References: <83lgl59r6j.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: Philipp Stephani > Date: Sun, 24 Sep 2017 08:00:53 +0000 > Cc: 27764@debbugs.gnu.org > > > (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name) > > - "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." > > + "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. > > +STARTUP-HOOKS is a list of functions that Emacs calls without > > +arguments after setting up the Ediff buffers. JOB-NAME is a > > +symbol describing the Ediff job type; it defaults to > > +`ediff-buffers'." > > Here and elsewhere where JOB-NAME is mentioned, it would be good to > have a full list of supported symbols, not just the default one. > > I've added some generic text to the docstrings. I have no idea what the full list of supported symbols are and > what the point of this argument is in the first place. 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. OK? Thanks. From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Nov 2017 16:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 27764@debbugs.gnu.org Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150989939512111 (code B ref 27764); Sun, 05 Nov 2017 16:30:02 +0000 Received: (at 27764) by debbugs.gnu.org; 5 Nov 2017 16:29:55 +0000 Received: from localhost ([127.0.0.1]:52436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBNo2-00039G-A1 for submit@debbugs.gnu.org; Sun, 05 Nov 2017 11:29:55 -0500 Received: from mail-qt0-f176.google.com ([209.85.216.176]:46403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBNo0-000392-Ht for 27764@debbugs.gnu.org; Sun, 05 Nov 2017 11:29:53 -0500 Received: by mail-qt0-f176.google.com with SMTP id 1so8366976qtn.3 for <27764@debbugs.gnu.org>; Sun, 05 Nov 2017 08:29:52 -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=fYJWHHHvTDuaUh4wLAKWRgjVywfqBmpB/sSyVVquDdw=; b=gcgQBjaQSY24cPQMPQzk/CJWfhbneLd3Q7DBcOKYF84vWQAqLrdqksq62sJEEYG27O gAKLZ5vO13161xq4puvzI2lPy4rZHbsUTr9NAC9CyOAfOjdj+XXW1/QzU3ZEqvWhk/ip JrXQFHeHgMkRTq+T72tsg1UmQZukYiEZ2xii/HeEU1yxEwyZCDn+UA1KhFdggmnHyTnL UEjWA4zOPk0cEkxSnIgK5m7sXGqBe5djTjmccz4+GHGwviIF6q+5S/9Qj57JlFEUZTSD ujAHnTcaoKDAIe75OpE7qzKI6gI3MQn5+ulAK8UQRuBf4AbQhr+i41dWY8po39ordSKp 5ftg== 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=fYJWHHHvTDuaUh4wLAKWRgjVywfqBmpB/sSyVVquDdw=; b=rjcqjj2Ot/XrloFgtNiILgKLkpXsBzKiAGYisuqGS6mO7tOQ+SzVLJFJ+NH+RZkfbv 1RMxP7+70W2YcuBjxdkWMPMBazQXMaaudozTm0z/kpCoFUcmOhlLOWPmbYMLVvas2BjL VvLYg7iFHx5nrfBH/aH67+8RzmSMEXP6ZpJ7NvbhvY0/LPKSytDNQwAAiClbX2RMrPx6 l+MPb5TnO18qMGwwwS0gvs3hElvegsyyUOLw1RfwaT3V0tymROdC/s24MEF8S8zlDC4Z InmrKuMlY52lFHa0Jc/AiHASlQ2Ir/rv69iZj6Wibpof1ozSBq83EpLW/Prx5TBKlnGG hJSw== X-Gm-Message-State: AMCzsaVWGrSBDfJy/v3RfV40kDpIWRRCvYFa2wbnIdXJ2Gk6hHRwjqpu 9ZZMaQXsaAgLW3OzDZNOP1sq0cLUyjgPEfKb82M= X-Google-Smtp-Source: ABhQp+T8FhSyyXCKFTgNpBNWfK0yXMDFsTHmw02cs2slt170xu0Jf/wh+RrP/QwEIbzgn/3+0O8+5Of/Ogfieww6Zt8= X-Received: by 10.200.1.72 with SMTP id f8mr17918433qtg.146.1509899386937; Sun, 05 Nov 2017 08:29:46 -0800 (PST) MIME-Version: 1.0 References: <83lgl59r6j.fsf@gnu.org> <83bmlu9dnm.fsf@gnu.org> In-Reply-To: <83bmlu9dnm.fsf@gnu.org> From: Philipp Stephani Date: Sun, 05 Nov 2017 16:29:35 +0000 Message-ID: Content-Type: multipart/mixed; boundary="f403045f26889c5e89055d3ed8ae" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --f403045f26889c5e89055d3ed8ae Content-Type: multipart/alternative; boundary="f403045f26889c5e86055d3ed8ac" --f403045f26889c5e86055d3ed8ac Content-Type: text/plain; charset="UTF-8" Eli Zaretskii schrieb am Fr., 29. Sep. 2017 um 09:18 Uhr: > > From: Philipp Stephani > > Date: Sun, 24 Sep 2017 08:00:53 +0000 > > Cc: 27764@debbugs.gnu.org > > > > > (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks > job-name) > > > - "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." > > > + "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B. > > > +STARTUP-HOOKS is a list of functions that Emacs calls without > > > +arguments after setting up the Ediff buffers. JOB-NAME is a > > > +symbol describing the Ediff job type; it defaults to > > > +`ediff-buffers'." > > > > Here and elsewhere where JOB-NAME is mentioned, it would be good to > > have a full list of supported symbols, not just the default one. > > > > I've added some generic text to the docstrings. I have no idea what the > full list of supported symbols are and > > what the point of this argument is in the first place. > > 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. --f403045f26889c5e86055d3ed8ac Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Eli Za= retskii <eliz@gnu.org> schrieb am= Fr., 29. Sep. 2017 um 09:18=C2=A0Uhr:
> From: Philipp Stephani <p.stephani2@gmail.com>
> Date: Sun, 24 Sep 2017 08:00:53 +0000
> Cc: 27764@d= ebbugs.gnu.org
>
>=C2=A0 > (defun ediff-buffers (buffer-A buffer-B &optional start= up-hooks job-name)
>=C2=A0 > - "Run Ediff on a pair of buffers, BUFFER-A and BUFFER= -B."
>=C2=A0 > + "Run Ediff on a pair of buffers, BUFFER-A and BUFFER= -B.
>=C2=A0 > +STARTUP-HOOKS is a list of functions that Emacs calls with= out
>=C2=A0 > +arguments after setting up the Ediff buffers. JOB-NAME is = a
>=C2=A0 > +symbol describing the Ediff job type; it defaults to
>=C2=A0 > +`ediff-buffers'."
>
>=C2=A0 Here and elsewhere where JOB-NAME is mentioned, it would be good= to
>=C2=A0 have a full list of supported symbols, not just the default one.=
>
> I've added some generic text to the docstrings. I have no idea wha= t the full list of supported symbols are and
> what the point of this argument is in the first place.

Can we have there at least the list of the symbols that are seen in
the sources:=C2=A0 I see these:

=C2=A0ediff-merge-files-with-ancestor, ediff-last-dir-ancestor,
=C2=A0ediff-last-dir-C, ediff-buffers, ediff-buffers3, ediff-merge-buffers,=
=C2=A0ediff-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.=C2=A0 I think either way would be much better than using some generic text.


Here's a new version of the patch.= =C2=A0
--f403045f26889c5e86055d3ed8ac-- --f403045f26889c5e89055d3ed8ae Content-Type: text/plain; charset="US-ASCII"; name="0001-Ediff-add-some-missing-documentation.txt" Content-Disposition: attachment; filename="0001-Ediff-add-some-missing-documentation.txt" Content-Transfer-Encoding: base64 Content-ID: <15f8d040b535970ead71> X-Attachment-Id: 15f8d040b535970ead71 RnJvbSBlMjkyYWY0ZDJhZDFiMTE1ZjAxZTg2ZTg1MTU2NjQ4NzMzNTU3MTJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwIFN0ZXBoYW5pIDxwaHN0QGdvb2dsZS5jb20+CkRh dGU6IFNhdCwgMjMgU2VwIDIwMTcgMjA6NDM6NDQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBFZGlm ZjogYWRkIHNvbWUgbWlzc2luZyBkb2N1bWVudGF0aW9uCgoqIHZjL2VkaWZmLmVsIChlZGlmZi1m aWxlcywgZWRpZmYtZmlsZXMzLCBlZGlmZi1idWZmZXJzKQooZWRpZmYtYnVmZmVyczMsIGVkaWZm LW1lcmdlLWRpcmVjdG9yaWVzKQooZWRpZmYtbWVyZ2UtZGlyZWN0b3JpZXMtd2l0aC1hbmNlc3Rv cikKKGVkaWZmLW1lcmdlLWRpcmVjdG9yeS1yZXZpc2lvbnMpCihlZGlmZi1tZXJnZS1kaXJlY3Rv cnktcmV2aXNpb25zLXdpdGgtYW5jZXN0b3IpCihlZGlmZi13aW5kb3dzLXdvcmR3aXNlLCBlZGlm Zi13aW5kb3dzLWxpbmV3aXNlKQooZWRpZmYtcmVnaW9ucy13b3Jkd2lzZSwgZWRpZmYtcmVnaW9u cy1saW5ld2lzZSkKKGVkaWZmLW1lcmdlLWZpbGVzLCBlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtYnVmZmVycywgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFu Y2VzdG9yKQooZWRpZmYtbWVyZ2UtcmV2aXNpb25zLCBlZGlmZi1tZXJnZS1yZXZpc2lvbnMtd2l0 aC1hbmNlc3RvcikKKGVkaWZmLXBhdGNoLWZpbGUsIGVkaWZmLXJldmlzaW9uKTogRG9jdW1lbnQg bWlzc2luZyBhcmd1bWVudHMuCihlZGlmZi1wYXRjaC1idWZmZXIsIGVkaWZmLXJldmlzaW9uKTog QWRkIHNlY29uZCBzcGFjZSBhZnRlcgpwZXJpb2QuCihlZGlmZi1maWxlcy1jb21tYW5kLCBlZGlm ZjMtZmlsZXMtY29tbWFuZCwgZWRpZmYtbWVyZ2UtY29tbWFuZCkKKGVkaWZmLW1lcmdlLXdpdGgt YW5jZXN0b3ItY29tbWFuZCwgZWRpZmYtZGlyZWN0b3JpZXMtY29tbWFuZCkKKGVkaWZmLWRpcmVj dG9yaWVzMy1jb21tYW5kLCBlZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy1jb21tYW5kKTogQWRkCmRv Y3VtZW50YXRpb24gZm9yIHRoZSBjb21tYW5kIGxpbmUgZnVuY3Rpb25zLgotLS0KIGxpc3AvdmMv ZWRpZmYuZWwgfCAxMjUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwMCBpbnNlcnRpb25zKCspLCAyNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3ZjL2VkaWZmLmVsIGIvbGlzcC92Yy9lZGlmZi5l bAppbmRleCBkMGY4ZTYzZGNiLi4wYWRmNTEzMjhlIDEwMDY0NAotLS0gYS9saXNwL3ZjL2VkaWZm LmVsCisrKyBiL2xpc3AvdmMvZWRpZmYuZWwKQEAgLTE4NSw3ICsxODUsOSBAQCBlZGlmZi1nZXQt ZGVmYXVsdC1maWxlLW5hbWUKIAogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZi1maWxlcyAo ZmlsZS1BIGZpbGUtQiAmb3B0aW9uYWwgc3RhcnR1cC1ob29rcykKLSAgIlJ1biBFZGlmZiBvbiBh IHBhaXIgb2YgZmlsZXMsIEZJTEUtQSBhbmQgRklMRS1CLiIKKyAgIlJ1biBFZGlmZiBvbiBhIHBh aXIgb2YgZmlsZXMsIEZJTEUtQSBhbmQgRklMRS1CLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qg b2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNl dHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChk aXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRpci1BCkBAIC0y MjEsNyArMjIzLDkgQEAgZWRpZmYtZmlsZXMKIAogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlm Zi1maWxlczMgKGZpbGUtQSBmaWxlLUIgZmlsZS1DICZvcHRpb25hbCBzdGFydHVwLWhvb2tzKQot ICAiUnVuIEVkaWZmIG9uIHRocmVlIGZpbGVzLCBGSUxFLUEsIEZJTEUtQiwgYW5kIEZJTEUtQy4i CisgICJSdW4gRWRpZmYgb24gdGhyZWUgZmlsZXMsIEZJTEUtQSwgRklMRS1CLCBhbmQgRklMRS1D LgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMg d2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgog ICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChkaXItQSAoaWYgZWRpZmYtdXNlLWxhc3QtZGlyCiAJ CSAgICBlZGlmZi1sYXN0LWRpci1BCkBAIC00MTksNyArNDIzLDE0IEBAIGVkaWZmLWJhY2t1cAog CiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWJ1ZmZlcnMgKGJ1ZmZlci1BIGJ1ZmZlci1C ICZvcHRpb25hbCBzdGFydHVwLWhvb2tzIGpvYi1uYW1lKQotICAiUnVuIEVkaWZmIG9uIGEgcGFp ciBvZiBidWZmZXJzLCBCVUZGRVItQSBhbmQgQlVGRkVSLUIuIgorICAiUnVuIEVkaWZmIG9uIGEg cGFpciBvZiBidWZmZXJzLCBCVUZGRVItQSBhbmQgQlVGRkVSLUIuCitTVEFSVFVQLUhPT0tTIGlz IGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cithcmd1bWVudHMg YWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4gIEpPQi1OQU1FIGlzIGEKK3N5bWJv bCBkZXNjcmliaW5nIHRoZSBFZGlmZiBqb2IgdHlwZTsgaXQgZGVmYXVsdHMgdG8KK2BlZGlmZi1i dWZmZXJzJywgYnV0IGNhbiBhbHNvIGJlIG9uZSBvZgorYGVkaWZmLW1lcmdlLWZpbGVzLXdpdGgt YW5jZXN0b3InLCBgZWRpZmYtbGFzdC1kaXItYW5jZXN0b3InLAorYGVkaWZmLWxhc3QtZGlyLUMn LCBgZWRpZmYtYnVmZmVyczMnLCBgZWRpZmYtbWVyZ2UtYnVmZmVycycsIG9yCitgZWRpZmYtbWVy Z2UtYnVmZmVycy13aXRoLWFuY2VzdG9yJy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoYmYp CiAgICAgIChsaXN0IChzZXRxIGJmIChyZWFkLWJ1ZmZlciAiQnVmZmVyIEEgdG8gY29tcGFyZTog IgpAQCAtNDQxLDcgKzQ1MiwxNCBAQCAnZWJ1ZmZlcnMKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4g ZWRpZmYtYnVmZmVyczMgKGJ1ZmZlci1BIGJ1ZmZlci1CIGJ1ZmZlci1DCiAJCQkJICZvcHRpb25h bCBzdGFydHVwLWhvb2tzIGpvYi1uYW1lKQotICAiUnVuIEVkaWZmIG9uIHRocmVlIGJ1ZmZlcnMs IEJVRkZFUi1BLCBCVUZGRVItQiwgYW5kIEJVRkZFUi1DLiIKKyAgIlJ1biBFZGlmZiBvbiB0aHJl ZSBidWZmZXJzLCBCVUZGRVItQSwgQlVGRkVSLUIsIGFuZCBCVUZGRVItQy4KK1NUQVJUVVAtSE9P S1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQKK2FyZ3Vt ZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYQor c3ltYm9sIGRlc2NyaWJpbmcgdGhlIEVkaWZmIGpvYiB0eXBlOyBpdCBkZWZhdWx0cyB0bworYGVk aWZmLWJ1ZmZlcnMzJywgYnV0IGNhbiBhbHNvIGJlIG9uZSBvZgorYGVkaWZmLW1lcmdlLWZpbGVz LXdpdGgtYW5jZXN0b3InLCBgZWRpZmYtbGFzdC1kaXItYW5jZXN0b3InLAorYGVkaWZmLWxhc3Qt ZGlyLUMnLCBgZWRpZmYtYnVmZmVycycsIGBlZGlmZi1tZXJnZS1idWZmZXJzJywgb3IKK2BlZGlm Zi1tZXJnZS1idWZmZXJzLXdpdGgtYW5jZXN0b3InLiIKICAgKGludGVyYWN0aXZlCiAgICAobGV0 IChiZiBiZmYpCiAgICAgIChsaXN0IChzZXRxIGJmIChyZWFkLWJ1ZmZlciAiQnVmZmVyIEEgdG8g Y29tcGFyZTogIgpAQCAtNjM3LDcgKzY1NSw4IEBAICdlZGlyczMKIChkZWZ1biBlZGlmZi1tZXJn ZS1kaXJlY3RvcmllcyAoZGlyMSBkaXIyIHJlZ2V4cCAmb3B0aW9uYWwgbWVyZ2UtYXV0b3N0b3Jl LWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIHBhaXIgb2YgZGlyZWN0b3JpZXMsIERJUjEgYW5kIERJ UjIsIG1lcmdpbmcgZmlsZXMgdGhhdCBoYXZlCiB0aGUgc2FtZSBuYW1lIGluIGJvdGguICBUaGUg dGhpcmQgYXJndW1lbnQsIFJFR0VYUCwgaXMgbmlsIG9yIGEgcmVndWxhcgotZXhwcmVzc2lvbjsg b25seSBmaWxlIG5hbWVzIHRoYXQgbWF0Y2ggdGhlIHJlZ2V4cCBhcmUgY29uc2lkZXJlZC4iCitl eHByZXNzaW9uOyBvbmx5IGZpbGUgbmFtZXMgdGhhdCBtYXRjaCB0aGUgcmVnZXhwIGFyZSBjb25z aWRlcmVkLgorTUVSR0UtQVVUT1NUT1JFLURJUiBpcyB0aGUgZGlyZWN0b3J5IGluIHdoaWNoIHRv IHN0b3JlIG1lcmdlZCBmaWxlcy4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChl ZGlmZi1nZXQtZGVmYXVsdC1kaXJlY3RvcnktbmFtZSkpCiAJIChkZWZhdWx0LXJlZ2V4cCAoZXZh bCBlZGlmZi1kZWZhdWx0LWZpbHRlcmluZy1yZWdleHApKQpAQCAtNjc0LDcgKzY5Myw4IEBAIGVk aWZmLW1lcmdlLWRpcmVjdG9yaWVzLXdpdGgtYW5jZXN0b3IKIEVkaWZmIG1lcmdlcyBmaWxlcyB0 aGF0IGhhdmUgaWRlbnRpY2FsIG5hbWVzIGluIERJUjEsIERJUjIuICBJZiBhIHBhaXIgb2YgZmls ZXMKIGluIERJUjEgYW5kIERJUjIgZG9lc24ndCBoYXZlIGFuIGFuY2VzdG9yIGluIEFOQ0VTVE9S LURJUiwgRWRpZmYgd2lsbCBtZXJnZQogd2l0aG91dCBhbmNlc3Rvci4gIFRoZSBmb3VydGggYXJn dW1lbnQsIFJFR0VYUCwgaXMgbmlsIG9yIGEgcmVndWxhciBleHByZXNzaW9uOwotb25seSBmaWxl IG5hbWVzIHRoYXQgbWF0Y2ggdGhlIHJlZ2V4cCBhcmUgY29uc2lkZXJlZC4iCitvbmx5IGZpbGUg bmFtZXMgdGhhdCBtYXRjaCB0aGUgcmVnZXhwIGFyZSBjb25zaWRlcmVkLgorTUVSR0UtQVVUT1NU T1JFLURJUiBpcyB0aGUgZGlyZWN0b3J5IGluIHdoaWNoIHRvIHN0b3JlIG1lcmdlZCBmaWxlcy4i CiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAoKGRpci1BIChlZGlmZi1nZXQtZGVmYXVsdC1kaXJl Y3RvcnktbmFtZSkpCiAJIChkZWZhdWx0LXJlZ2V4cCAoZXZhbCBlZGlmZi1kZWZhdWx0LWZpbHRl cmluZy1yZWdleHApKQpAQCAtNzEwLDcgKzczMCw4IEBAIGVkaWZmLW1lcmdlLWRpcmVjdG9yeS1y ZXZpc2lvbnMKIAkJCQkJICAgICAmb3B0aW9uYWwgbWVyZ2UtYXV0b3N0b3JlLWRpcikKICAgIlJ1 biBFZGlmZiBvbiBhIGRpcmVjdG9yeSwgRElSMSwgbWVyZ2luZyBpdHMgZmlsZXMgd2l0aCB0aGVp ciByZXZpc2lvbnMuCiBUaGUgc2Vjb25kIGFyZ3VtZW50LCBSRUdFWFAsIGlzIGEgcmVndWxhciBl eHByZXNzaW9uIHRoYXQgZmlsdGVycyB0aGUgZmlsZQotbmFtZXMuICBPbmx5IHRoZSBmaWxlcyB0 aGF0IGFyZSB1bmRlciByZXZpc2lvbiBjb250cm9sIGFyZSB0YWtlbiBpbnRvIGFjY291bnQuIgor bmFtZXMuICBPbmx5IHRoZSBmaWxlcyB0aGF0IGFyZSB1bmRlciByZXZpc2lvbiBjb250cm9sIGFy ZSB0YWtlbiBpbnRvIGFjY291bnQuCitNRVJHRS1BVVRPU1RPUkUtRElSIGlzIHRoZSBkaXJlY3Rv cnkgaW4gd2hpY2ggdG8gc3RvcmUgbWVyZ2VkIGZpbGVzLiIKICAgKGludGVyYWN0aXZlCiAgICAo bGV0ICgoZGlyLUEgKGVkaWZmLWdldC1kZWZhdWx0LWRpcmVjdG9yeS1uYW1lKSkKIAkgKGRlZmF1 bHQtcmVnZXhwIChldmFsIGVkaWZmLWRlZmF1bHQtZmlsdGVyaW5nLXJlZ2V4cCkpCkBAIC03NDAs NyArNzYxLDggQEAgZWRpZmYtbWVyZ2UtZGlyZWN0b3J5LXJldmlzaW9ucy13aXRoLWFuY2VzdG9y CiAJCQkJCQkJICAgbWVyZ2UtYXV0b3N0b3JlLWRpcikKICAgIlJ1biBFZGlmZiBvbiBhIGRpcmVj dG9yeSwgRElSMSwgbWVyZ2luZyBpdHMgZmlsZXMgd2l0aCB0aGVpciByZXZpc2lvbnMgYW5kIGFu Y2VzdG9ycy4KIFRoZSBzZWNvbmQgYXJndW1lbnQsIFJFR0VYUCwgaXMgYSByZWd1bGFyIGV4cHJl c3Npb24gdGhhdCBmaWx0ZXJzIHRoZSBmaWxlCi1uYW1lcy4gIE9ubHkgdGhlIGZpbGVzIHRoYXQg YXJlIHVuZGVyIHJldmlzaW9uIGNvbnRyb2wgYXJlIHRha2VuIGludG8gYWNjb3VudC4iCituYW1l cy4gIE9ubHkgdGhlIGZpbGVzIHRoYXQgYXJlIHVuZGVyIHJldmlzaW9uIGNvbnRyb2wgYXJlIHRh a2VuIGludG8gYWNjb3VudC4KK01FUkdFLUFVVE9TVE9SRS1ESVIgaXMgdGhlIGRpcmVjdG9yeSBp biB3aGljaCB0byBzdG9yZSBtZXJnZWQgZmlsZXMuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQg KChkaXItQSAoZWRpZmYtZ2V0LWRlZmF1bHQtZGlyZWN0b3J5LW5hbWUpKQogCSAoZGVmYXVsdC1y ZWdleHAgKGV2YWwgZWRpZmYtZGVmYXVsdC1maWx0ZXJpbmctcmVnZXhwKSkKQEAgLTkwOCw3ICs5 MzAsOSBAQCBlZGlmZi13aW5kb3dzLXdvcmR3aXNlCiBXaXRoIHByZWZpeCBhcmd1bWVudCwgRFVN Qi1NT0RFLCBvciBvbiBhIG5vbi13aW5kb3dpbmcgZGlzcGxheSwgd29ya3MgYXMKIGZvbGxvd3M6 CiBJZiBXSU5ELUEgaXMgbmlsLCB1c2Ugc2VsZWN0ZWQgd2luZG93LgotSWYgV0lORC1CIGlzIG5p bCwgdXNlIHdpbmRvdyBuZXh0IHRvIFdJTkQtQS4iCitJZiBXSU5ELUIgaXMgbmlsLCB1c2Ugd2lu ZG93IG5leHQgdG8gV0lORC1BLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25z IHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhl IEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUgIlAiKQogICAoZWRpZmYtd2luZG93cyBk dW1iLW1vZGUgd2luZC1BIHdpbmQtQgogCQkgc3RhcnR1cC1ob29rcyAnZWRpZmYtd2luZG93cy13 b3Jkd2lzZSAnd29yZC1tb2RlKSkKQEAgLTkxOSw3ICs5NDMsOSBAQCBlZGlmZi13aW5kb3dzLWxp bmV3aXNlCiBXaXRoIHByZWZpeCBhcmd1bWVudCwgRFVNQi1NT0RFLCBvciBvbiBhIG5vbi13aW5k b3dpbmcgZGlzcGxheSwgd29ya3MgYXMKIGZvbGxvd3M6CiBJZiBXSU5ELUEgaXMgbmlsLCB1c2Ug c2VsZWN0ZWQgd2luZG93LgotSWYgV0lORC1CIGlzIG5pbCwgdXNlIHdpbmRvdyBuZXh0IHRvIFdJ TkQtQS4iCitJZiBXSU5ELUIgaXMgbmlsLCB1c2Ugd2luZG93IG5leHQgdG8gV0lORC1BLgorU1RB UlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91 dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50 ZXJhY3RpdmUgIlAiKQogICAoZWRpZmYtd2luZG93cyBkdW1iLW1vZGUgd2luZC1BIHdpbmQtQgog CQkgc3RhcnR1cC1ob29rcyAnZWRpZmYtd2luZG93cy1saW5ld2lzZSBuaWwpKQpAQCAtOTYzLDkg Kzk4OSwxMiBAQCBlZGlmZi13aW5kb3dzCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLXJl Z2lvbnMtd29yZHdpc2UgKGJ1ZmZlci1BIGJ1ZmZlci1CICZvcHRpb25hbCBzdGFydHVwLWhvb2tz KQogICAiUnVuIEVkaWZmIG9uIGEgcGFpciBvZiByZWdpb25zIGluIHNwZWNpZmllZCBidWZmZXJz LgorQlVGRkVSLUEgYW5kIEJVRkZFUi1CIGFyZSB0aGUgYnVmZmVycyB0byBiZSBjb21wYXJlZC4K IFJlZ2lvbnMgKGkuZS4sIHBvaW50IGFuZCBtYXJrKSBjYW4gYmUgc2V0IGluIGFkdmFuY2Ugb3Ig bWFya2VkIGludGVyYWN0aXZlbHkuCiBUaGlzIGZ1bmN0aW9uIGlzIGVmZmVjdGl2ZSBvbmx5IGZv ciByZWxhdGl2ZWx5IHNtYWxsIHJlZ2lvbnMsIHVwIHRvIDIwMAotbGluZXMuICBGb3IgbGFyZ2Ug cmVnaW9ucywgdXNlIGBlZGlmZi1yZWdpb25zLWxpbmV3aXNlJy4iCitsaW5lcy4gIEZvciBsYXJn ZSByZWdpb25zLCB1c2UgYGVkaWZmLXJlZ2lvbnMtbGluZXdpc2UnLgorU1RBUlRVUC1IT09LUyBp cyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRz IGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICAoaW50ZXJhY3RpdmUKICAg IChsZXQgKGJmKQogICAgICAobGlzdCAoc2V0cSBiZiAocmVhZC1idWZmZXIgIlJlZ2lvbidzIEEg YnVmZmVyOiAiCkBAIC0xMDAzLDEwICsxMDMyLDEzIEBAIGVkaWZmLXJlZ2lvbnMtd29yZHdpc2UK IDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRpZmYtcmVnaW9ucy1saW5ld2lzZSAoYnVmZmVyLUEg YnVmZmVyLUIgJm9wdGlvbmFsIHN0YXJ0dXAtaG9va3MpCiAgICJSdW4gRWRpZmYgb24gYSBwYWly IG9mIHJlZ2lvbnMgaW4gc3BlY2lmaWVkIGJ1ZmZlcnMuCitCVUZGRVItQSBhbmQgQlVGRkVSLUIg YXJlIHRoZSBidWZmZXJzIHRvIGJlIGNvbXBhcmVkLgogUmVnaW9ucyAoaS5lLiwgcG9pbnQgYW5k IG1hcmspIGNhbiBiZSBzZXQgaW4gYWR2YW5jZSBvciBtYXJrZWQgaW50ZXJhY3RpdmVseS4KIEVh Y2ggcmVnaW9uIGlzIGVubGFyZ2VkIHRvIGNvbnRhaW4gZnVsbCBsaW5lcy4KIFRoaXMgZnVuY3Rp b24gaXMgZWZmZWN0aXZlIGZvciBsYXJnZSByZWdpb25zLCBvdmVyIDEwMC0yMDAKLWxpbmVzLiAg Rm9yIHNtYWxsIHJlZ2lvbnMsIHVzZSBgZWRpZmYtcmVnaW9ucy13b3Jkd2lzZScuIgorbGluZXMu ICBGb3Igc21hbGwgcmVnaW9ucywgdXNlIGBlZGlmZi1yZWdpb25zLXdvcmR3aXNlJy4KK1NUQVJU VVAtSE9PS1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQK K2FyZ3VtZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLiIKICAgKGludGVy YWN0aXZlCiAgICAobGV0IChiZikKICAgICAgKGxpc3QgKHNldHEgYmYgKHJlYWQtYnVmZmVyICJS ZWdpb24gQSdzIGJ1ZmZlcjogIgpAQCAtMTEyNyw3ICsxMTU5LDExIEBAIGVkaWZmLW1lcmdlLWZp bGVzCiAJCQkJIDs7IE1FUkdFLUJVRkZFUi1GSUxFIGlzIHRoZSBmaWxlIHRvIGJlCiAJCQkJIDs7 IGFzc29jaWF0ZWQgd2l0aCB0aGUgbWVyZ2UgYnVmZmVyCiAJCQkJICZvcHRpb25hbCBzdGFydHVw LWhvb2tzIG1lcmdlLWJ1ZmZlci1maWxlKQotICAiTWVyZ2UgdHdvIGZpbGVzIHdpdGhvdXQgYW5j ZXN0b3IuIgorICAiTWVyZ2UgdHdvIGZpbGVzIHdpdGhvdXQgYW5jZXN0b3IuCitGSUxFLUEgYW5k IEZJTEUtQiBhcmUgdGhlIG5hbWVzIG9mIHRoZSBmaWxlcyB0byBiZSBtZXJnZWQuCitTVEFSVFVQ LUhPT0tTIGlzIGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcyBjYWxscyB3aXRob3V0Cith cmd1bWVudHMgYWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4gIE1FUkdFLUJVRkZF Ui1GSUxFCitpcyB0aGUgbmFtZSBvZiB0aGUgZmlsZSB0byBiZSBhc3NvY2lhdGVkIHdpdGggdGhl IG1lcmdlIGJ1ZmZlci4uIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChkaXItQSAoaWYgZWRp ZmYtdXNlLWxhc3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRpci1BCkBAIC0xMTcxLDcgKzEyMDcs MTIgQEAgZWRpZmYtbWVyZ2UtZmlsZXMtd2l0aC1hbmNlc3RvcgogCQkJCQkgICAgICAgOzsgdG8g YmUgYXNzb2NpYXRlZCB3aXRoIHRoZQogCQkJCQkgICAgICAgOzsgbWVyZ2UgYnVmZmVyCiAJCQkJ CSAgICAgICBtZXJnZS1idWZmZXItZmlsZSkKLSAgIk1lcmdlIHR3byBmaWxlcyB3aXRoIGFuY2Vz dG9yLiIKKyAgIk1lcmdlIHR3byBmaWxlcyB3aXRoIGFuY2VzdG9yLgorRklMRS1BIGFuZCBGSUxF LUIgYXJlIHRoZSBuYW1lcyBvZiB0aGUgZmlsZXMgdG8gYmUgbWVyZ2VkLCBhbmQKK0ZJTEUtQU5D RVNUT1IgaXMgdGhlIG5hbWUgb2YgdGhlIGFuY2VzdG9yIGZpbGUuICBTVEFSVFVQLUhPT0tTIGlz CithIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dCBhcmd1bWVudHMg YWZ0ZXIKK3NldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuICBNRVJHRS1CVUZGRVItRklMRSBp cyB0aGUgbmFtZSBvZgordGhlIGZpbGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBtZXJnZSBi dWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKChkaXItQSAoaWYgZWRpZmYtdXNlLWxh c3QtZGlyCiAJCSAgICBlZGlmZi1sYXN0LWRpci1BCkBAIC0xMjI5LDcgKzEyNzAsMTYgQEAgZWRp ZmYtbWVyZ2UtYnVmZmVycwogCQkJCSAgICAgOzsgTUVSR0UtQlVGRkVSLUZJTEUgaXMgdGhlIGZp bGUgdG8gYmUKIAkJCQkgICAgIDs7IGFzc29jaWF0ZWQgd2l0aCB0aGUgbWVyZ2UgYnVmZmVyCiAJ CQkJICAgICBzdGFydHVwLWhvb2tzIGpvYi1uYW1lIG1lcmdlLWJ1ZmZlci1maWxlKQotICAiTWVy Z2UgYnVmZmVycyB3aXRob3V0IGFuY2VzdG9yLiIKKyAgIk1lcmdlIGJ1ZmZlcnMgd2l0aG91dCBh bmNlc3Rvci4KK0JVRkZFUi1BIGFuZCBCVUZGRVItQiBhcmUgdGhlIGJ1ZmZlcnMgdG8gYmUgbWVy Z2VkLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2Fs bHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMu ICBKT0ItTkFNRSBpcyBhCitzeW1ib2wgZGVzY3JpYmluZyB0aGUgRWRpZmYgam9iIHR5cGU7IGl0 IGRlZmF1bHRzIHRvCitgZWRpZmYtbWVyZ2UtYnVmZmVycycsIGJ1dCBjYW4gYWxzbyBiZSBvbmUg b2YKK2BlZGlmZi1tZXJnZS1maWxlcy13aXRoLWFuY2VzdG9yJywgYGVkaWZmLWxhc3QtZGlyLWFu Y2VzdG9yJywKK2BlZGlmZi1sYXN0LWRpci1DJywgYGVkaWZmLWJ1ZmZlcnMnLCBgZWRpZmYtYnVm ZmVyczMnLCBvcgorYGVkaWZmLW1lcmdlLWJ1ZmZlcnMtd2l0aC1hbmNlc3RvcicuICBNRVJHRS1C VUZGRVItRklMRSBpcyB0aGUKK25hbWUgb2YgdGhlIGZpbGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRo IHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKGJmKQogICAgICAo bGlzdCAoc2V0cSBiZiAocmVhZC1idWZmZXIgIkJ1ZmZlciBBIHRvIG1lcmdlOiAiCkBAIC0xMjU2 LDcgKzEzMDYsMTYgQEAgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRoLWFuY2VzdG9yCiAJCQkJCQkg ICA7OyBmaWxlIHRvIGJlIGFzc29jaWF0ZWQKIAkJCQkJCSAgIDs7IHdpdGggdGhlIG1lcmdlIGJ1 ZmZlcgogCQkJCQkJICAgbWVyZ2UtYnVmZmVyLWZpbGUpCi0gICJNZXJnZSBidWZmZXJzIHdpdGgg YW5jZXN0b3IuIgorICAiTWVyZ2UgYnVmZmVycyB3aXRoIGFuY2VzdG9yLgorQlVGRkVSLUEgYW5k IEJVRkZFUi1CIGFyZSB0aGUgYnVmZmVycyB0byBiZSBtZXJnZWQsIGFuZAorQlVGRkVSLUFOQ0VT VE9SIGlzIHRoZWlyIGFuY2VzdG9yLiAgU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qgb2YKK2Z1bmN0 aW9ucyB0aGF0IEVtYWNzIGNhbGxzIHdpdGhvdXQgYXJndW1lbnRzIGFmdGVyIHNldHRpbmcgdXAg dGhlCitFZGlmZiBidWZmZXJzLiAgSk9CLU5BTUUgaXMgYSBzeW1ib2wgZGVzY3JpYmluZyB0aGUg RWRpZmYgam9iCit0eXBlOyBpdCBkZWZhdWx0cyB0byBgZWRpZmYtbWVyZ2UtYnVmZmVycy13aXRo LWFuY2VzdG9yJywgYnV0IGNhbgorYWxzbyBiZSBvbmUgb2YgYGVkaWZmLW1lcmdlLWZpbGVzLXdp dGgtYW5jZXN0b3InLAorYGVkaWZmLWxhc3QtZGlyLWFuY2VzdG9yJywgYGVkaWZmLWxhc3QtZGly LUMnLCBgZWRpZmYtYnVmZmVycycsCitgZWRpZmYtYnVmZmVyczMnLCBvciBgZWRpZmYtbWVyZ2Ut YnVmZmVycycuICBNRVJHRS1CVUZGRVItRklMRSBpcwordGhlIG5hbWUgb2YgdGhlIGZpbGUgdG8g YmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUKICAg IChsZXQgKGJmIGJmZikKICAgICAgKGxpc3QgKHNldHEgYmYgKHJlYWQtYnVmZmVyICJCdWZmZXIg QSB0byBtZXJnZTogIgpAQCAtMTI4Nyw4ICsxMzQ2LDExIEBAIGVkaWZmLW1lcmdlLWJ1ZmZlcnMt d2l0aC1hbmNlc3RvcgogKGRlZnVuIGVkaWZmLW1lcmdlLXJldmlzaW9ucyAoJm9wdGlvbmFsIGZp bGUgc3RhcnR1cC1ob29rcyBtZXJnZS1idWZmZXItZmlsZSkKICAgOzsgTUVSR0UtQlVGRkVSLUZJ TEUgaXMgdGhlIGZpbGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBtZXJnZSBidWZmZXIKICAg IlJ1biBFZGlmZiBieSBtZXJnaW5nIHR3byByZXZpc2lvbnMgb2YgYSBmaWxlLgotVGhlIGZpbGUg aXMgdGhlIG9wdGlvbmFsIEZJTEUgYXJndW1lbnQgb3IgdGhlIGZpbGUgdmlzaXRlZCBieSB0aGUg Y3VycmVudAotYnVmZmVyLiIKK1RoZSBmaWxlIGlzIHRoZSBvcHRpb25hbCBGSUxFIGFyZ3VtZW50 IG9yIHRoZSBmaWxlIHZpc2l0ZWQgYnkgdGhlCitjdXJyZW50IGJ1ZmZlci4gIFNUQVJUVVAtSE9P S1MgaXMgYSBsaXN0IG9mIGZ1bmN0aW9ucyB0aGF0IEVtYWNzCitjYWxscyB3aXRob3V0IGFyZ3Vt ZW50cyBhZnRlciBzZXR0aW5nIHVwIHRoZSBFZGlmZiBidWZmZXJzLgorTUVSR0UtQlVGRkVSLUZJ TEUgaXMgdGhlIG5hbWUgb2YgdGhlIGZpbGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRoCit0aGUgbWVy Z2UgYnVmZmVyLiIKICAgKGludGVyYWN0aXZlKQogICAoaWYgKHN0cmluZ3AgZmlsZSkgKGZpbmQt ZmlsZSBmaWxlKSkKICAgKGxldCAocmV2MSByZXYyKQpAQCAtMTMxOSw4ICsxMzgxLDExIEBAIGVk aWZmLW1lcmdlLXJldmlzaW9ucy13aXRoLWFuY2VzdG9yCiAJCQkJCSAgICA7OyBidWZmZXIKIAkJ CQkJICAgIG1lcmdlLWJ1ZmZlci1maWxlKQogICAiUnVuIEVkaWZmIGJ5IG1lcmdpbmcgdHdvIHJl dmlzaW9ucyBvZiBhIGZpbGUgd2l0aCBhIGNvbW1vbiBhbmNlc3Rvci4KLVRoZSBmaWxlIGlzIHRo ZSBvcHRpb25hbCBGSUxFIGFyZ3VtZW50IG9yIHRoZSBmaWxlIHZpc2l0ZWQgYnkgdGhlIGN1cnJl bnQKLWJ1ZmZlci4iCitUaGUgZmlsZSBpcyB0aGUgb3B0aW9uYWwgRklMRSBhcmd1bWVudCBvciB0 aGUgZmlsZSB2aXNpdGVkIGJ5IHRoZQorY3VycmVudCBidWZmZXIuICBTVEFSVFVQLUhPT0tTIGlz IGEgbGlzdCBvZiBmdW5jdGlvbnMgdGhhdCBFbWFjcworY2FsbHMgd2l0aG91dCBhcmd1bWVudHMg YWZ0ZXIgc2V0dGluZyB1cCB0aGUgRWRpZmYgYnVmZmVycy4KK01FUkdFLUJVRkZFUi1GSUxFIGlz IHRoZSBuYW1lIG9mIHRoZSBmaWxlIHRvIGJlIGFzc29jaWF0ZWQgd2l0aAordGhlIG1lcmdlIGJ1 ZmZlci4iCiAgIChpbnRlcmFjdGl2ZSkKICAgKGlmIChzdHJpbmdwIGZpbGUpIChmaW5kLWZpbGUg ZmlsZSkpCiAgIChsZXQgKHJldjEgcmV2MiBhbmNlc3Rvci1yZXYpCkBAIC0xMzYwLDggKzE0MjUs OCBAQCBlZGlmZi1wYXRjaC1maWxlCiAgICJRdWVyeSBmb3IgYSBmaWxlIG5hbWUsIGFuZCB0aGVu IHJ1biBFZGlmZiBieSBwYXRjaGluZyB0aGF0IGZpbGUuCiBJZiBvcHRpb25hbCBQQVRDSC1CVUYg aXMgZ2l2ZW4sIHVzZSB0aGUgcGF0Y2ggaW4gdGhhdCBidWZmZXIKIGFuZCBkb24ndCBhc2sgdGhl IHVzZXIuCi1JZiBwcmVmaXggYXJndW1lbnQsIHRoZW46IGlmIGV2ZW4gYXJndW1lbnQsIGFzc3Vt ZSB0aGF0IHRoZSBwYXRjaCBpcyBpbiBhCi1idWZmZXIuIElmIG9kZCAtLSBhc3N1bWUgaXQgaXMg aW4gYSBmaWxlLiIKK0lmIHByZWZpeCBhcmd1bWVudCBBUkcsIHRoZW46IGlmIGV2ZW4gYXJndW1l bnQsIGFzc3VtZSB0aGF0IHRoZQorcGF0Y2ggaXMgaW4gYSBidWZmZXIuICBJZiBvZGQgLS0gYXNz dW1lIGl0IGlzIGluIGEgZmlsZS4iCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIChsZXQgKHNvdXJj ZS1kaXIgc291cmNlLWZpbGUpCiAgICAgKHJlcXVpcmUgJ2VkaWZmLXB0Y2gpCkBAIC0xMzk0LDcg KzE0NTksNyBAQCBlZGlmZi1wYXRjaC1idWZmZXIKIFdpdGggQVJHPTEsIGFzc3VtZXMgdGhlIHBh dGNoIGlzIGluIGEgZmlsZSBhbmQgcHJvbXB0cyBmb3IgdGhlIGZpbGUuCiBXaXRoIEFSRz0yLCBh c3N1bWVzIHRoZSBwYXRjaCBpcyBpbiBhIGJ1ZmZlciBhbmQgcHJvbXB0cyBmb3IgdGhlIGJ1ZmZl ci4KIFBBVENILUJVRiBpcyBhbiBvcHRpb25hbCBhcmd1bWVudCwgd2hpY2ggc3BlY2lmaWVzIHRo ZSBidWZmZXIgdGhhdCBjb250YWlucyB0aGUKLXBhdGNoLiBJZiBub3QgZ2l2ZW4sIHRoZSB1c2Vy IGlzIHByb21wdGVkIGFjY29yZGluZyB0byB0aGUgcHJlZml4IGFyZ3VtZW50LiIKK3BhdGNoLiAg SWYgbm90IGdpdmVuLCB0aGUgdXNlciBpcyBwcm9tcHRlZCBhY2NvcmRpbmcgdG8gdGhlIHByZWZp eCBhcmd1bWVudC4iCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIChyZXF1aXJlICdlZGlmZi1wdGNo KQogICAoc2V0cSBwYXRjaC1idWYKQEAgLTE0MjEsNyArMTQ4Niw5IEBAIGVkaWZmLXJldmlzaW9u CiAgICJSdW4gRWRpZmYgYnkgY29tcGFyaW5nIHZlcnNpb25zIG9mIGEgZmlsZS4KIFRoZSBmaWxl IGlzIGFuIG9wdGlvbmFsIEZJTEUgYXJndW1lbnQgb3IgdGhlIGZpbGUgZW50ZXJlZCBhdCB0aGUg cHJvbXB0LgogRGVmYXVsdDogdGhlIGZpbGUgdmlzaXRlZCBieSB0aGUgY3VycmVudCBidWZmZXIu Ci1Vc2VzIGB2Yy5lbCcgb3IgYHJjcy5lbCcgZGVwZW5kaW5nIG9uIGBlZGlmZi12ZXJzaW9uLWNv bnRyb2wtcGFja2FnZScuIgorVXNlcyBgdmMuZWwnIG9yIGByY3MuZWwnIGRlcGVuZGluZyBvbiBg ZWRpZmYtdmVyc2lvbi1jb250cm9sLXBhY2thZ2UnLgorU1RBUlRVUC1IT09LUyBpcyBhIGxpc3Qg b2YgZnVuY3Rpb25zIHRoYXQgRW1hY3MgY2FsbHMgd2l0aG91dAorYXJndW1lbnRzIGFmdGVyIHNl dHRpbmcgdXAgdGhlIEVkaWZmIGJ1ZmZlcnMuIgogICA7OyBpZiBidWZmZXIgaXMgbm9uLW5pbCwg dXNlIHRoYXQgYnVmZmVyIGluc3RlYWQgb2YgdGhlIGN1cnJlbnQgYnVmZmVyCiAgIChpbnRlcmFj dGl2ZSAiUCIpCiAgIChpZiAobm90IChzdHJpbmdwIGZpbGUpKQpAQCAtMTQzNCw3ICsxNTAxLDcg QEAgZWRpZmYtcmV2aXNpb24KIAkJCQknbm8tZGlycykpKQogICAoZmluZC1maWxlIGZpbGUpCiAg IChpZiAoYW5kIChidWZmZXItbW9kaWZpZWQtcCkKLQkgICAoeS1vci1uLXAgKGZvcm1hdCAiQnVm ZmVyICVzIGlzIG1vZGlmaWVkLiBTYXZlIGJ1ZmZlcj8gIgorCSAgICh5LW9yLW4tcCAoZm9ybWF0 ICJCdWZmZXIgJXMgaXMgbW9kaWZpZWQuICBTYXZlIGJ1ZmZlcj8gIgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoYnVmZmVyLW5hbWUpKSkpCiAgICAgICAoc2F2ZS1idWZmZXIgKGN1cnJl bnQtYnVmZmVyKSkpCiAgIChsZXQgKHJldjEgcmV2MikKQEAgLTE1MTcsNiArMTU4NCw3IEBAIGVk aWZmLWRvY3VtZW50YXRpb24KIAogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZi1maWxlcy1j b21tYW5kICgpCisgICJDYWxsIGBlZGlmZi1maWxlcycgd2l0aCB0aGUgbmV4dCB0d28gY29tbWFu ZCBsaW5lIGFyZ3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAwIGNvbW1hbmQtbGluZS1h cmdzLWxlZnQpKQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQpKSkKICAg ICAoc2V0cSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0IChudGhjZHIgMiBjb21tYW5kLWxpbmUtYXJn cy1sZWZ0KSkKQEAgLTE1MjQsNiArMTU5Miw3IEBAIGVkaWZmLWZpbGVzLWNvbW1hbmQKIAogOzs7 IyMjYXV0b2xvYWQKIChkZWZ1biBlZGlmZjMtZmlsZXMtY29tbWFuZCAoKQorICAiQ2FsbCBgZWRp ZmYzLWZpbGVzJyB3aXRoIHRoZSBuZXh0IHRocmVlIGNvbW1hbmQgbGluZSBhcmd1bWVudHMuIgog ICAobGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1i IChudGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkoZmlsZS1jIChudGggMiBjb21tYW5k LWxpbmUtYXJncy1sZWZ0KSkpCkBAIC0xNTMyLDYgKzE2MDEsNyBAQCBlZGlmZjMtZmlsZXMtY29t bWFuZAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLW1lcmdlLWNvbW1hbmQgKCkKKyAg IkNhbGwgYGVkaWZmLW1lcmdlLWZpbGVzJyB3aXRoIHRoZSBuZXh0IHR3byBjb21tYW5kIGxpbmUg YXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUtYSAobnRoIDAgY29tbWFuZC1saW5lLWFyZ3MtbGVm dCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpKQogICAgIChzZXRx IGNvbW1hbmQtbGluZS1hcmdzLWxlZnQgKG50aGNkciAyIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQp KQpAQCAtMTUzOSw2ICsxNjA5LDcgQEAgZWRpZmYtbWVyZ2UtY29tbWFuZAogCiA7OzsjIyNhdXRv bG9hZAogKGRlZnVuIGVkaWZmLW1lcmdlLXdpdGgtYW5jZXN0b3ItY29tbWFuZCAoKQorICAiQ2Fs bCBgZWRpZmYtbWVyZ2UtZmlsZXMtd2l0aC1hbmNlc3Rvcicgd2l0aCB0aGUgbmV4dCB0aHJlZSBj b21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUtYSAobnRoIDAgY29tbWFuZC1s aW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkp CiAJKGFuY2VzdG9yIChudGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkpCkBAIC0xNTQ3LDYg KzE2MTgsNyBAQCBlZGlmZi1tZXJnZS13aXRoLWFuY2VzdG9yLWNvbW1hbmQKIAogOzs7IyMjYXV0 b2xvYWQKIChkZWZ1biBlZGlmZi1kaXJlY3Rvcmllcy1jb21tYW5kICgpCisgICJDYWxsIGBlZGlm Zi1kaXJlY3Rvcmllcycgd2l0aCB0aGUgbmV4dCB0aHJlZSBjb21tYW5kIGxpbmUgYXJndW1lbnRz LiIKICAgKGxldCAoKGZpbGUtYSAobnRoIDAgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZp bGUtYiAobnRoIDEgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKHJlZ2V4cCAobnRoIDIgY29t bWFuZC1saW5lLWFyZ3MtbGVmdCkpKQpAQCAtMTU1NSw2ICsxNjI3LDcgQEAgZWRpZmYtZGlyZWN0 b3JpZXMtY29tbWFuZAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGVkaWZmLWRpcmVjdG9yaWVz My1jb21tYW5kICgpCisgICJDYWxsIGBlZGlmZi1kaXJlY3RvcmllczMnIHdpdGggdGhlIG5leHQg Zm91ciBjb21tYW5kIGxpbmUgYXJndW1lbnRzLiIKICAgKGxldCAoKGZpbGUtYSAobnRoIDAgY29t bWFuZC1saW5lLWFyZ3MtbGVmdCkpCiAJKGZpbGUtYiAobnRoIDEgY29tbWFuZC1saW5lLWFyZ3Mt bGVmdCkpCiAJKGZpbGUtYyAobnRoIDIgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCkBAIC0xNTY0 LDYgKzE2MzcsNyBAQCBlZGlmZi1kaXJlY3RvcmllczMtY29tbWFuZAogCiA7OzsjIyNhdXRvbG9h ZAogKGRlZnVuIGVkaWZmLW1lcmdlLWRpcmVjdG9yaWVzLWNvbW1hbmQgKCkKKyAgIkNhbGwgYGVk aWZmLW1lcmdlLWRpcmVjdG9yaWVzJyB3aXRoIHRoZSBuZXh0IHRocmVlIGNvbW1hbmQgbGluZSBh cmd1bWVudHMuIgogICAobGV0ICgoZmlsZS1hIChudGggMCBjb21tYW5kLWxpbmUtYXJncy1sZWZ0 KSkKIAkoZmlsZS1iIChudGggMSBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkKIAkocmVnZXhwIChu dGggMiBjb21tYW5kLWxpbmUtYXJncy1sZWZ0KSkpCkBAIC0xNTcyLDYgKzE2NDYsNyBAQCBlZGlm Zi1tZXJnZS1kaXJlY3Rvcmllcy1jb21tYW5kCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZWRp ZmYtbWVyZ2UtZGlyZWN0b3JpZXMtd2l0aC1hbmNlc3Rvci1jb21tYW5kICgpCisgICJDYWxsIGBl ZGlmZi1tZXJnZS1kaXJlY3Rvcmllcy13aXRoLWFuY2VzdG9yJyB3aXRoIHRoZSBuZXh0IGZvdXIg Y29tbWFuZCBsaW5lIGFyZ3VtZW50cy4iCiAgIChsZXQgKChmaWxlLWEgKG50aCAwIGNvbW1hbmQt bGluZS1hcmdzLWxlZnQpKQogCShmaWxlLWIgKG50aCAxIGNvbW1hbmQtbGluZS1hcmdzLWxlZnQp KQogCShhbmNlc3RvciAobnRoIDIgY29tbWFuZC1saW5lLWFyZ3MtbGVmdCkpCi0tIAoyLjE0LjIK Cg== --f403045f26889c5e89055d3ed8ae-- From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Nov 2017 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Philipp Stephani Cc: 27764@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.150990071414201 (code B ref 27764); Sun, 05 Nov 2017 16:52:02 +0000 Received: (at 27764) by debbugs.gnu.org; 5 Nov 2017 16:51:54 +0000 Received: from localhost ([127.0.0.1]:52463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBO9K-0003gy-GJ for submit@debbugs.gnu.org; Sun, 05 Nov 2017 11:51:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBO9I-0003gm-Im for 27764@debbugs.gnu.org; Sun, 05 Nov 2017 11:51:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBO9A-0002Re-9h for 27764@debbugs.gnu.org; Sun, 05 Nov 2017 11:51:47 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBO9A-0002Ra-68; Sun, 05 Nov 2017 11:51:44 -0500 Received: from [176.228.60.248] (port=1597 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eBO99-0004nF-Lb; Sun, 05 Nov 2017 11:51:44 -0500 Date: Sun, 05 Nov 2017 18:51:47 +0200 Message-Id: <834lq8u0rg.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from Philipp Stephani on Sun, 05 Nov 2017 16:29:35 +0000) References: <83lgl59r6j.fsf@gnu.org> <83bmlu9dnm.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > 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. From unknown Sun Aug 10 16:47:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Nov 2017 17:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii , 27764-done@debbugs.gnu.org Cc: "27764@debbugs.gnu.org" <27764@debbugs.gnu.org> Received: via spool by 27764-submit@debbugs.gnu.org id=B27764.15099045052355 (code B ref 27764); Sun, 05 Nov 2017 17:56:01 +0000 Received: (at 27764) by debbugs.gnu.org; 5 Nov 2017 17:55:05 +0000 Received: from localhost ([127.0.0.1]:52557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eBP8T-0000br-2o for submit@debbugs.gnu.org; Sun, 05 Nov 2017 12:55:05 -0500 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 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) MIME-Version: 1.0 References: <83lgl59r6j.fsf@gnu.org> <83bmlu9dnm.fsf@gnu.org> <834lq8u0rg.fsf@gnu.org> In-Reply-To: <834lq8u0rg.fsf@gnu.org> From: Philipp Stephani Date: Sun, 05 Nov 2017 17:54:47 +0000 Message-ID: Content-Type: multipart/alternative; boundary="001a114704224320ad055d4009f4" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --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-- From unknown Sun Aug 10 16:47:00 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Philipp Stephani Subject: bug#27764: closed (Re: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented) Message-ID: References: X-Gnu-PR-Message: they-closed 27764 X-Gnu-PR-Package: emacs Reply-To: 27764@debbugs.gnu.org Date: Sun, 05 Nov 2017 17:56:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1509904562-2425-1" This is a multi-part message in MIME format... ------------=_1509904562-2425-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 27764@debbugs.gnu.org. --=20 27764: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D27764 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1509904562-2425-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 27764-done) by debbugs.gnu.org; 5 Nov 2017 17:55:05 +0000 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 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 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) MIME-Version: 1.0 References: <83lgl59r6j.fsf@gnu.org> <83bmlu9dnm.fsf@gnu.org> <834lq8u0rg.fsf@gnu.org> In-Reply-To: <834lq8u0rg.fsf@gnu.org> From: Philipp Stephani Date: Sun, 05 Nov 2017 17:54:47 +0000 Message-ID: Subject: Re: bug#27764: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented To: Eli Zaretskii , 27764-done@debbugs.gnu.org Content-Type: multipart/alternative; boundary="001a114704224320ad055d4009f4" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 27764-done Cc: "27764@debbugs.gnu.org" <27764@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --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-- ------------=_1509904562-2425-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 19 Jul 2017 09:20:29 +0000 Received: from localhost ([127.0.0.1]:47152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXl9h-000148-HY for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXl9e-00013o-Jy for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXl9Y-0004L2-5t for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:21 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dXl9Y-0004Ku-2r for submit@debbugs.gnu.org; Wed, 19 Jul 2017 05:20:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXl9W-0004Fi-Go for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXl9V-0004IU-Dx for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:18 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:35488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXl9V-0004GP-6S for bug-gnu-emacs@gnu.org; Wed, 19 Jul 2017 05:20:17 -0400 Received: by mail-wr0-x22f.google.com with SMTP id k71so2616135wrc.2 for ; Wed, 19 Jul 2017 02:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pj4rZ6ktr0MRq9NBtjQgkxB0K8WTyOpf3cCyERmhzPA=; b=FYJuYSw5Tj08voYdSCuQ9MoHoIkD5E4V/8bxVgA0K6npVAwMku3SxvNmxBHFSaNA18 BhbG8Hyx814goZmqDd8mqgEv/E7Trk+cQhouhPGUPyY70o4J9/3BblawQ2zEYISMTWYp 3TWjxijDw95baVcHDC1TnWGtkRCJui+nSwfR8Pno/bnhUII8xKKs/tSODvCmWI2VQFzB HEodUxSicgnBbyM7QX0saaRMXbWyLMBEq252bQspGPLRCvZNM2TZTryhnF++RzUWb3rK ieljRHW/szhK+YMhf3ohK7upREh95Mg08OzrQtMstWJcjFY6Q3wnN3dZCJr2rPjsG1D/ 5yuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pj4rZ6ktr0MRq9NBtjQgkxB0K8WTyOpf3cCyERmhzPA=; b=rjCLDuy4oP42zIXHv9t3H824TDoOiwJsva6J68DqZtKCHHnNP/4gy7omxHS/SpJE+c rX507XObf/zqRrvH+z65fp7hbNggLjK16+vw5f3uRET1wXtaar6cVxlEYBAuoIPo6y1w J0YCxjCwn4J0eKyuPTSLarRoWNbXjULUCQMw+x3XPCjP67euyw63+hQD1Yw8lSjgwMsd Zcg+eTEIwzaDltPs45H0dYIBuLgIC2f0gDNK27mavOs8z6E0HVruewtlxDb4Eb8yAKt2 jy7zURwGtryJ6JIISeqco1Q7zGw3+F+4JmNeevVUhe+2dOKSiyc9iswzRpsVhjfA8E9p HWqQ== X-Gm-Message-State: AIVw110wkQPe/wS9m3IFZ19ojJ6kBqd58u4kh9eO8cy9OkpGcc64dOnR h7qAx9CPRrzAMIicoZ0= X-Received: by 10.223.171.69 with SMTP id r5mr3539491wrc.57.1500456013126; Wed, 19 Jul 2017 02:20:13 -0700 (PDT) Received: from a.muc.corp.google.com ([2a00:79e0:15:4:684f:4f01:42e1:c983]) by smtp.gmail.com with ESMTPSA id o6sm5392517wrc.48.2017.07.19.02.20.12 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 19 Jul 2017 02:20:12 -0700 (PDT) From: Philipp Stephani To: bug-gnu-emacs@gnu.org Subject: 26.0.50; Argument STARTUP-HOOKS for `ediff-files' undocumented Date: Wed, 19 Jul 2017 11:20:11 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.8 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.8 (---) The docstring of `ediff-files' doesn't document the STARTUP-HOOKS argument. Please amend the docstring. In GNU Emacs 26.0.50 (build 9, x86_64-pc-linux-gnu, GTK+ Version 3.10.8) of 2017-07-19 built on localhost Repository revision: 47429dcb4afd502e5bff9d37a09b030c0b7e0eb0 Windowing system distributor 'The X.Org Foundation', version 11.0.11803000 System Description: 'Ubuntu 14.04 LTS' Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Configured using: 'configure --enable-gcc-warnings --without-pop --with-mailutils --enable-checking --enable-check-lisp-object-type --with-modules 'CFLAGS=3D-O0 -ggdb3'' Configured features: XPM JPEG TIFF GIF PNG SOUND GSETTINGS NOTIFY GNUTLS FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message subr-x puny seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib dired dired-loaddefs format-spec rfc822 mml easymenu mml-sec password-cache epa derived epg epg-config gnus-util rmail rmail-loaddefs mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 94899 7621) (symbols 48 20234 1) (miscs 40 39 120) (strings 32 28620 1543) (string-bytes 1 766344) (vectors 16 13972) (vector-slots 8 492162 8202) (floats 8 48 68) (intervals 56 222 0) (buffers 992 12) (heap 1024 28062 1067)) --=20 Google Germany GmbH Erika-Mann-Stra=C3=9Fe 33 80636 M=C3=BCnchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Gesch=C3=A4ftsf=C3=BChrer: Matthew Scott Sucherman, Paul Terence Manicle Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und l=C3= =B6schen Sie die E-Mail und alle Anh=C3=A4nge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do = not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks. ------------=_1509904562-2425-1--