From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sebastian Urban Newsgroups: gmane.emacs.bugs Subject: bug#35885: 25.2; Few mistakes in Emacs Manual (+ proposals) Date: Thu, 20 Aug 2020 20:24:32 +0200 Message-ID: References: <87v9hkvygw.fsf@gnus.org> <47224e43-28c1-04d0-4418-b8f069a48b0c@gmail.com> <87d03qx2mm.fsf@gnus.org> <9d2594a9-8632-eb3b-18aa-359584c96753@gmail.com> <87k0xwj97f.fsf@gnus.org> <87r1s37xb2.fsf@gnus.org> <5047e985-673d-1c3c-4f97-0353e83285a9@gmail.com> <87o8n5xz9t.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------09A6DF47614A63E377A800E4" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36631"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 Cc: 35885@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 20 20:25:12 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k8pFO-0009Pu-F6 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 20 Aug 2020 20:25:10 +0200 Original-Received: from localhost ([::1]:38570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8pFN-0003O7-9T for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 20 Aug 2020 14:25:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8pFG-0003Ny-IL for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 14:25:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8pFG-0000y7-8f for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 14:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8pFG-0007i3-5j for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sebastian Urban Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Aug 2020 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35885 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 35885-submit@debbugs.gnu.org id=B35885.159794787829600 (code B ref 35885); Thu, 20 Aug 2020 18:25:02 +0000 Original-Received: (at 35885) by debbugs.gnu.org; 20 Aug 2020 18:24:38 +0000 Original-Received: from localhost ([127.0.0.1]:44001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8pEr-0007hL-FR for submit@debbugs.gnu.org; Thu, 20 Aug 2020 14:24:38 -0400 Original-Received: from mail-ej1-f51.google.com ([209.85.218.51]:42232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8pEp-0007hA-GT for 35885@debbugs.gnu.org; Thu, 20 Aug 2020 14:24:36 -0400 Original-Received: by mail-ej1-f51.google.com with SMTP id g19so3639372ejc.9 for <35885@debbugs.gnu.org>; Thu, 20 Aug 2020 11:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=Fq539krUU5Rf7zdYpItZmN1KJlxn+FPls5MGz5malYg=; b=r8rqtJgFNHYeWpbwS8T36x1uOMXZoKp5fZ9OPCf42jIbI0gydEIrh+xWeh3gM4wKS2 SDiKbRzqmmkJW6BP9GUuHqXj/ZWznGLTae66g7Okp4YWdRFTE20STIIaCI8EiWKqxyLd +BxWMDNsB+Eaq9nCvYd6Sa5HMobzg4AHgtMEzRwxstNMKLNFZwsQsq/xFr+8n8FiH9rN Azfp3l6tCunmiSqrS4JnxgAl1WKsMAqvrYLd5pBSwWx5ghmR2NFSJ/O9NEUw33nEjxoI /zmKi9NRIRlo4dRsDI2Hg+/zE1ea5uqsmoSxrviYHrW6Ar7hP3vzqac1KYs2XCzc3hgB y0ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=Fq539krUU5Rf7zdYpItZmN1KJlxn+FPls5MGz5malYg=; b=BaxitMhzaC4j/tN74GXqxqzO6X8Ges4yxJBUXFLPKZ+oJN0tYr9eaHElYamZp8I+Uu kPqGjXKJL4Z//aNb4tKDCPaq/6rw0vfxviYq35fGybCkDY3QsCHWT3K1/SXFOc9t+SYb Z51V//kQi9p0WSOw+sX5M3YD3rgBuGkZKhI3OwnR4liim5AZwC/f3/7Z64hMjHff/4M2 /OcDBtmXWBiP79Ahwwn8uGX5rOVXZG3dVX6XE/YE6GTSEdjr+KVUMnVFdjWSy3lWJRif +bQH44YsNoBA7EDU1+ksJ+bgJOiOn6G0FMTooKJ5oBHucMqUo+Dm1Z5pP6OBmfqNZS4F kE4Q== X-Gm-Message-State: AOAM531MEyR38RBvfbZ1jI3Y8bFPzdqmcnIEzAHqfFRuCDVYmNVDQ1in Y+tApd3vzuEiddBdzfC3Rm0nFVpS3l8= X-Google-Smtp-Source: ABdhPJzc/n+1AN2+e3fXdPcenbT6q1g3s8mrgPp9zOfd85/cBWYxyWRS5p/HEI72vqEvm33U+gVBpg== X-Received: by 2002:a17:906:e0d:: with SMTP id l13mr4753217eji.434.1597947868983; Thu, 20 Aug 2020 11:24:28 -0700 (PDT) Original-Received: from [192.168.42.148] (public-gprs359645.centertel.pl. [37.47.36.30]) by smtp.gmail.com with ESMTPSA id w7sm1892877ejy.4.2020.08.20.11.24.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2020 11:24:27 -0700 (PDT) In-Reply-To: <87o8n5xz9t.fsf@gnus.org> Content-Language: en-GB X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:185749 Archived-At: This is a multi-part message in MIME format. --------------09A6DF47614A63E377A800E4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Alright, updated version of changes, without @verb. NOTE: Based on TEXI files from emacs-27 branch, downloaded 19.08.2020. * BASIC.TEXI ============ 1. Apparently, pushing "C-x 8 ]" to the next page made "C-x 8" (the same paragraph, above) split after "C-x", so another @w is needed. 2. (OPTIONAL) I removed @verb, but kept reorder of the words. As I wrote in the original message: I also moved examples to the end of part of the sentence, this way we have: description followed by an example, instead of example being in the middle of description. Also, last example is split between lines, so I had to use @w. --8<---------------cut here---------------start------------->8--- --- old/basic.texi 2020-08-20 17:59:31.446496400 +0200 +++ new/basic.texi 2020-08-20 18:17:59.289249300 +0200 @@ -112,7 +112,7 @@ @cindex curly quotes, inserting @cindex curved quotes, inserting A few common Unicode characters can be inserted via a command -starting with @kbd{C-x 8}. For example, @kbd{C-x 8 [} inserts @t{‘} +starting with @w{@kbd{C-x 8}}. For example, @kbd{C-x 8 [} inserts @t{‘} which is Unicode code-point U+2018 @sc{left single quotation mark}, sometimes called a left single ``curved quote'' or ``curly quote''. Similarly, @w{@kbd{C-x 8 ]}}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the @@ -147,10 +147,10 @@ In addition, in some contexts, if you type a quotation using grave accent and apostrophe @kbd{`like this'}, it is converted to a form -@t{‘like this’} using single quotation marks, even without @kbd{C-x 8} -commands. Similarly, typing a quotation @kbd{``like this''} using -double grave accent and apostrophe converts it to a form @t{“like -this”} using double quotation marks. @xref{Quotation Marks}. +using single quotation marks @t{‘like this’}, even without @kbd{C-x 8} +commands. Similarly, typing a quotation using double grave accent and +apostrophe @kbd{``like this''}, converts it to a form using double +quotation marks @w{@t{“like this”}}. @xref{Quotation Marks}. @node Moving Point @section Changing the Location of Point --8<---------------cut here---------------end--------------->8--- * DISPLAY.TEXI ============== 1. Changed @samp to @t, as far as I remember it's preferred for quotes. 2. Similarly, in (...), I changed @samp to @kbd. Although, this time there is a page break after "(`", so @w around parens is needed. But it moves "(` and ')" to the next page. If we want to keep it on the same page, we have to include (inside @w) word "quotes", i.e. "@w{quotes (@kbd{`} and @kbd{'})}". 3. If I didn't make mistake there should be ASCII quotes not curved quotes, so I changed @t to @kbd. --8<---------------cut here---------------start------------->8--- --- old/display.texi 2020-08-19 15:44:43.000000000 +0200 +++ new/display.texi 2020-08-20 18:53:25.061187600 +0200 @@ -1632,10 +1632,10 @@ @cindex curved quotes, and terminal capabilities @cindex @code{homoglyph} face -Emacs tries to determine if the curved quotes @samp{‘} and @samp{’} +Emacs tries to determine if the curved quotes @t{‘} and @t{’} can be displayed on the current display. By default, if this seems to -be so, then Emacs will translate the @acronym{ASCII} quotes (@samp{`} -and @samp{'}), when they appear in messages and help texts, to these +be so, then Emacs will translate the @acronym{ASCII} quotes @w{(@kbd{`} +and @kbd{'})}, when they appear in messages and help texts, to these curved quotes. You can influence or inhibit this translation by customizing the user option @code{text-quoting-style} (@pxref{Keys in Documentation,,, elisp, The Emacs Lisp Reference Manual}). @@ -1644,7 +1644,7 @@ known to look just like @acronym{ASCII} characters, they are shown with the @code{homoglyph} face. Curved quotes that are known not to be displayable are shown as their @acronym{ASCII} approximations -@t{`}, @t{'}, and @t{"} with the @code{homoglyph} face. +@kbd{`}, @kbd{'}, and @kbd{"} with the @code{homoglyph} face. @node Cursor Display @section Displaying the Cursor --8<---------------cut here---------------end--------------->8--- * MODES.TEXI ============ Since, we are sticking to @kbd, and not using @verb, no changes in this file. * TEXT.TEXI =========== 1. Quotes are fixed, so we don't need FIXME note. 2. Changed @t to @kbd, because straight quotes are needed. 3. Changed `...' and ``...'' to ‘...’ and “...”, and put them inside of @t, because it works now. 4. Quoting myself again: Value of "electric-quote-chars" has so many @w, because: A. To prevent splitting between lines, which happens; B. ?‘ expands to ¿, so I had to prevent it (@w near ?’ ?“ ?”, are unnecessary, but I put them anyway for consistency and just in case something in the future change, i.e. for safety). As for splitting, with @w it is put in the next line alone, perhaps it would look better with "is" in front of it, if yes - "is" must be put inside @w. 5. Changed @t{"} to @kbd{"}, because we want "quotation mark". 6. Changed `` and '' to @t{“} and @t{”}, reason the same as in (3.). --8<---------------cut here---------------start------------->8--- --- old/text.texi 2020-08-19 15:45:20.000000000 +0200 +++ new/text.texi 2020-08-20 19:40:15.062523900 +0200 @@ -421,13 +421,12 @@ @cindex curved quotes @cindex guillemets @findex electric-quote-mode -@c The funny quoting below is to make the printed version look -@c correct. FIXME. + One common way to quote is the typewriter convention, which quotes -using straight apostrophes @t{'like this'} or double-quotes @t{"like +using straight apostrophes @kbd{'like this'} or double-quotes @kbd{"like this"}. Another common way is the curved quote convention, which uses -left and right single or double quotation marks `@t{like this}' or -``@t{like this}''@footnote{ +left and right single or double quotation marks @t{‘like this’} or +@t{“like this”}@footnote{ The curved single quote characters are U+2018 @sc{left single quotation mark} and U+2019 @sc{right single quotation mark}; the curved double quotes are U+201C @sc{left double quotation mark} and U+201D @sc{right double @@ -445,7 +444,7 @@ @code{electric-quote-chars}, a list of four characters, where the items correspond to the left single quote, the right single quote, the left double quote and the right double quote, respectively, whose -default value is @code{'(?@r{`} ?@r{'} ?@r{``} ?@r{''})}. +default value is @w{@code{'(@w{?}‘ @w{?}’ @w{?}“ @w{?}”)}}. @vindex electric-quote-paragraph @vindex electric-quote-comment @@ -461,7 +460,7 @@ @vindex electric-quote-replace-double You can also set the option @code{electric-quote-replace-double} to -a non-@code{nil} value. Then, typing @t{"} insert an appropriate +a non-@code{nil} value. Then, typing @kbd{"} insert an appropriate curved double quote depending on context: @t{“} at the beginning of the buffer or after a line break, whitespace, opening parenthesis, or quote character, and @t{”} otherwise. @@ -473,7 +472,7 @@ type @kbd{C-q `} or @kbd{C-q '} instead of @kbd{`} or @kbd{'}. To insert a curved quote even when Electric Quote is disabled or inactive, you can type @kbd{C-x 8 [} for @t{‘}, @kbd{C-x 8 ]} for -@t{’}, @kbd{C-x 8 @{} for ``, and @kbd{C-x 8 @}} for ''. +@t{’}, @kbd{C-x 8 @{} for @t{“}, and @kbd{C-x 8 @}} for @t{”}. @xref{Inserting Text}. Note that the value of @code{electric-quote-chars} does not affect these keybindings, they are not keybindings of @code{electric-quote-mode} but bound in --8<---------------cut here---------------end--------------->8--- * EMACS.TEXI ============ This will change header style (PDF), to this: +-------------------------+ +------------------------+ | PAGE_NUM DOC_TITLE | |CHAPTER PAGE_NUM | --8<---------------cut here---------------start------------->8--- --- old/emacs.texi 2020-08-19 15:44:47.000000000 +0200 +++ new/emacs.texi 2020-08-20 20:06:46.751323200 +0200 @@ -99,6 +99,7 @@ @end titlepage +@headings double @summarycontents @contents --8<---------------cut here---------------end--------------->8--- That's all, S. U. --------------09A6DF47614A63E377A800E4 Content-Type: text/plain; charset=UTF-8; name="basic.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="basic.diff" LS0tIG9sZC9iYXNpYy50ZXhpCTIwMjAtMDgtMjAgMTc6NTk6MzEuNDQ2NDk2NDAwICswMjAw CisrKyBuZXcvYmFzaWMudGV4aQkyMDIwLTA4LTIwIDE4OjE3OjU5LjI4OTI0OTMwMCArMDIw MApAQCAtMTEyLDcgKzExMiw3IEBACiBAY2luZGV4IGN1cmx5IHF1b3RlcywgaW5zZXJ0aW5n CiBAY2luZGV4IGN1cnZlZCBxdW90ZXMsIGluc2VydGluZwogICBBIGZldyBjb21tb24gVW5p Y29kZSBjaGFyYWN0ZXJzIGNhbiBiZSBpbnNlcnRlZCB2aWEgYSBjb21tYW5kCi1zdGFydGlu ZyB3aXRoIEBrYmR7Qy14IDh9LiAgRm9yIGV4YW1wbGUsIEBrYmR7Qy14IDggW30gaW5zZXJ0 cyBAdHvigJh9CitzdGFydGluZyB3aXRoIEB3e0BrYmR7Qy14IDh9fS4gIEZvciBleGFtcGxl LCBAa2Jke0MteCA4IFt9IGluc2VydHMgQHR74oCYfQogd2hpY2ggaXMgVW5pY29kZSBjb2Rl LXBvaW50IFUrMjAxOCBAc2N7bGVmdCBzaW5nbGUgcXVvdGF0aW9uIG1hcmt9LAogc29tZXRp bWVzIGNhbGxlZCBhIGxlZnQgc2luZ2xlIGBgY3VydmVkIHF1b3RlJycgb3IgYGBjdXJseSBx dW90ZScnLgogU2ltaWxhcmx5LCBAd3tAa2Jke0MteCA4IF19fSwgQGtiZHtDLXggOCBAe30g YW5kIEBrYmR7Qy14IDggQH19IGluc2VydCB0aGUKQEAgLTE0NywxMCArMTQ3LDEwIEBACiAK ICAgSW4gYWRkaXRpb24sIGluIHNvbWUgY29udGV4dHMsIGlmIHlvdSB0eXBlIGEgcXVvdGF0 aW9uIHVzaW5nIGdyYXZlCiBhY2NlbnQgYW5kIGFwb3N0cm9waGUgQGtiZHtgbGlrZSB0aGlz J30sIGl0IGlzIGNvbnZlcnRlZCB0byBhIGZvcm0KLUB0e+KAmGxpa2UgdGhpc+KAmX0gdXNp bmcgc2luZ2xlIHF1b3RhdGlvbiBtYXJrcywgZXZlbiB3aXRob3V0IEBrYmR7Qy14IDh9Ci1j b21tYW5kcy4gIFNpbWlsYXJseSwgdHlwaW5nIGEgcXVvdGF0aW9uIEBrYmR7YGBsaWtlIHRo aXMnJ30gdXNpbmcKLWRvdWJsZSBncmF2ZSBhY2NlbnQgYW5kIGFwb3N0cm9waGUgY29udmVy dHMgaXQgdG8gYSBmb3JtIEB0e+KAnGxpa2UKLXRoaXPigJ19IHVzaW5nIGRvdWJsZSBxdW90 YXRpb24gbWFya3MuICBAeHJlZntRdW90YXRpb24gTWFya3N9LgordXNpbmcgc2luZ2xlIHF1 b3RhdGlvbiBtYXJrcyBAdHvigJhsaWtlIHRoaXPigJl9LCBldmVuIHdpdGhvdXQgQGtiZHtD LXggOH0KK2NvbW1hbmRzLiAgU2ltaWxhcmx5LCB0eXBpbmcgYSBxdW90YXRpb24gdXNpbmcg ZG91YmxlIGdyYXZlIGFjY2VudCBhbmQKK2Fwb3N0cm9waGUgQGtiZHtgYGxpa2UgdGhpcycn fSwgY29udmVydHMgaXQgdG8gYSBmb3JtIHVzaW5nIGRvdWJsZQorcXVvdGF0aW9uIG1hcmtz IEB3e0B0e+KAnGxpa2UgdGhpc+KAnX19LiAgQHhyZWZ7UXVvdGF0aW9uIE1hcmtzfS4KIAog QG5vZGUgTW92aW5nIFBvaW50CiBAc2VjdGlvbiBDaGFuZ2luZyB0aGUgTG9jYXRpb24gb2Yg UG9pbnQK --------------09A6DF47614A63E377A800E4 Content-Type: text/plain; charset=UTF-8; name="display.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="display.diff" LS0tIG9sZC9kaXNwbGF5LnRleGkJMjAyMC0wOC0xOSAxNTo0NDo0My4wMDAwMDAwMDAgKzAy MDAKKysrIG5ldy9kaXNwbGF5LnRleGkJMjAyMC0wOC0yMCAxODo1MzoyNS4wNjExODc2MDAg KzAyMDAKQEAgLTE2MzIsMTAgKzE2MzIsMTAgQEAKIEBjaW5kZXggY3VydmVkIHF1b3Rlcywg YW5kIHRlcm1pbmFsIGNhcGFiaWxpdGllcwogQGNpbmRleCBAY29kZXtob21vZ2x5cGh9IGZh Y2UKIAotRW1hY3MgdHJpZXMgdG8gZGV0ZXJtaW5lIGlmIHRoZSBjdXJ2ZWQgcXVvdGVzIEBz YW1we+KAmH0gYW5kIEBzYW1we+KAmX0KK0VtYWNzIHRyaWVzIHRvIGRldGVybWluZSBpZiB0 aGUgY3VydmVkIHF1b3RlcyBAdHvigJh9IGFuZCBAdHvigJl9CiBjYW4gYmUgZGlzcGxheWVk IG9uIHRoZSBjdXJyZW50IGRpc3BsYXkuICBCeSBkZWZhdWx0LCBpZiB0aGlzIHNlZW1zIHRv Ci1iZSBzbywgdGhlbiBFbWFjcyB3aWxsIHRyYW5zbGF0ZSB0aGUgQGFjcm9ueW17QVNDSUl9 IHF1b3RlcyAoQHNhbXB7YH0KLWFuZCBAc2FtcHsnfSksIHdoZW4gdGhleSBhcHBlYXIgaW4g bWVzc2FnZXMgYW5kIGhlbHAgdGV4dHMsIHRvIHRoZXNlCitiZSBzbywgdGhlbiBFbWFjcyB3 aWxsIHRyYW5zbGF0ZSB0aGUgQGFjcm9ueW17QVNDSUl9IHF1b3RlcyBAd3soQGtiZHtgfQor YW5kIEBrYmR7J30pfSwgd2hlbiB0aGV5IGFwcGVhciBpbiBtZXNzYWdlcyBhbmQgaGVscCB0 ZXh0cywgdG8gdGhlc2UKIGN1cnZlZCBxdW90ZXMuICBZb3UgY2FuIGluZmx1ZW5jZSBvciBp bmhpYml0IHRoaXMgdHJhbnNsYXRpb24gYnkKIGN1c3RvbWl6aW5nIHRoZSB1c2VyIG9wdGlv biBAY29kZXt0ZXh0LXF1b3Rpbmctc3R5bGV9IChAcHhyZWZ7S2V5cyBpbgogRG9jdW1lbnRh dGlvbiwsLCBlbGlzcCwgVGhlIEVtYWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgpAQCAt MTY0NCw3ICsxNjQ0LDcgQEAKIGtub3duIHRvIGxvb2sganVzdCBsaWtlIEBhY3Jvbnlte0FT Q0lJfSBjaGFyYWN0ZXJzLCB0aGV5IGFyZSBzaG93bgogd2l0aCB0aGUgQGNvZGV7aG9tb2ds eXBofSBmYWNlLiAgQ3VydmVkIHF1b3RlcyB0aGF0IGFyZSBrbm93biBub3QgdG8KIGJlIGRp c3BsYXlhYmxlIGFyZSBzaG93biBhcyB0aGVpciBAYWNyb255bXtBU0NJSX0gYXBwcm94aW1h dGlvbnMKLUB0e2B9LCBAdHsnfSwgYW5kIEB0eyJ9IHdpdGggdGhlIEBjb2Rle2hvbW9nbHlw aH0gZmFjZS4KK0BrYmR7YH0sIEBrYmR7J30sIGFuZCBAa2JkeyJ9IHdpdGggdGhlIEBjb2Rl e2hvbW9nbHlwaH0gZmFjZS4KIAogQG5vZGUgQ3Vyc29yIERpc3BsYXkKIEBzZWN0aW9uIERp c3BsYXlpbmcgdGhlIEN1cnNvcgo= --------------09A6DF47614A63E377A800E4 Content-Type: text/plain; charset=UTF-8; name="emacs.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="emacs.diff" LS0tIG9sZC9lbWFjcy50ZXhpCTIwMjAtMDgtMTkgMTU6NDQ6NDcuMDAwMDAwMDAwICswMjAw CisrKyBuZXcvZW1hY3MudGV4aQkyMDIwLTA4LTIwIDIwOjA2OjQ2Ljc1MTMyMzIwMCArMDIw MApAQCAtOTksNiArOTksNyBAQAogCiBAZW5kIHRpdGxlcGFnZQogCitAaGVhZGluZ3MgZG91 YmxlCiAKIEBzdW1tYXJ5Y29udGVudHMKIEBjb250ZW50cwo= --------------09A6DF47614A63E377A800E4 Content-Type: text/plain; charset=UTF-8; name="text.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="text.diff" LS0tIG9sZC90ZXh0LnRleGkJMjAyMC0wOC0xOSAxNTo0NToyMC4wMDAwMDAwMDAgKzAyMDAK KysrIG5ldy90ZXh0LnRleGkJMjAyMC0wOC0yMCAxOTo0MDoxNS4wNjI1MjM5MDAgKzAyMDAK QEAgLTQyMSwxMyArNDIxLDEyIEBACiBAY2luZGV4IGN1cnZlZCBxdW90ZXMKIEBjaW5kZXgg Z3VpbGxlbWV0cwogQGZpbmRleCBlbGVjdHJpYy1xdW90ZS1tb2RlCi1AYyBUaGUgZnVubnkg cXVvdGluZyBiZWxvdyBpcyB0byBtYWtlIHRoZSBwcmludGVkIHZlcnNpb24gbG9vawotQGMg Y29ycmVjdC4gIEZJWE1FLgorCiAgIE9uZSBjb21tb24gd2F5IHRvIHF1b3RlIGlzIHRoZSB0 eXBld3JpdGVyIGNvbnZlbnRpb24sIHdoaWNoIHF1b3RlcwotdXNpbmcgc3RyYWlnaHQgYXBv c3Ryb3BoZXMgQHR7J2xpa2UgdGhpcyd9IG9yIGRvdWJsZS1xdW90ZXMgQHR7Imxpa2UKK3Vz aW5nIHN0cmFpZ2h0IGFwb3N0cm9waGVzIEBrYmR7J2xpa2UgdGhpcyd9IG9yIGRvdWJsZS1x dW90ZXMgQGtiZHsibGlrZQogdGhpcyJ9LiAgQW5vdGhlciBjb21tb24gd2F5IGlzIHRoZSBj dXJ2ZWQgcXVvdGUgY29udmVudGlvbiwgd2hpY2ggdXNlcwotbGVmdCBhbmQgcmlnaHQgc2lu Z2xlIG9yIGRvdWJsZSBxdW90YXRpb24gbWFya3MgYEB0e2xpa2UgdGhpc30nIG9yCi1gYEB0 e2xpa2UgdGhpc30nJ0Bmb290bm90ZXsKK2xlZnQgYW5kIHJpZ2h0IHNpbmdsZSBvciBkb3Vi bGUgcXVvdGF0aW9uIG1hcmtzIEB0e+KAmGxpa2UgdGhpc+KAmX0gb3IKK0B0e+KAnGxpa2Ug dGhpc+KAnX1AZm9vdG5vdGV7CiBUaGUgY3VydmVkIHNpbmdsZSBxdW90ZSBjaGFyYWN0ZXJz IGFyZSBVKzIwMTggQHNje2xlZnQgc2luZ2xlIHF1b3RhdGlvbgogbWFya30gYW5kIFUrMjAx OSBAc2N7cmlnaHQgc2luZ2xlIHF1b3RhdGlvbiBtYXJrfTsgdGhlIGN1cnZlZCBkb3VibGUg cXVvdGVzCiBhcmUgVSsyMDFDIEBzY3tsZWZ0IGRvdWJsZSBxdW90YXRpb24gbWFya30gYW5k IFUrMjAxRCBAc2N7cmlnaHQgZG91YmxlCkBAIC00NDUsNyArNDQ0LDcgQEAKIEBjb2Rle2Vs ZWN0cmljLXF1b3RlLWNoYXJzfSwgYSBsaXN0IG9mIGZvdXIgY2hhcmFjdGVycywgd2hlcmUg dGhlCiBpdGVtcyBjb3JyZXNwb25kIHRvIHRoZSBsZWZ0IHNpbmdsZSBxdW90ZSwgdGhlIHJp Z2h0IHNpbmdsZSBxdW90ZSwgdGhlCiBsZWZ0IGRvdWJsZSBxdW90ZSBhbmQgdGhlIHJpZ2h0 IGRvdWJsZSBxdW90ZSwgcmVzcGVjdGl2ZWx5LCB3aG9zZQotZGVmYXVsdCB2YWx1ZSBpcyBA Y29kZXsnKD9AcntgfSA/QHJ7J30gP0Bye2BgfSA/QHJ7Jyd9KX0uCitkZWZhdWx0IHZhbHVl IGlzIEB3e0Bjb2RleycoQHd7P33igJggQHd7P33igJkgQHd7P33igJwgQHd7P33igJ0pfX0u CiAKIEB2aW5kZXggZWxlY3RyaWMtcXVvdGUtcGFyYWdyYXBoCiBAdmluZGV4IGVsZWN0cmlj LXF1b3RlLWNvbW1lbnQKQEAgLTQ2MSw3ICs0NjAsNyBAQAogCiBAdmluZGV4IGVsZWN0cmlj LXF1b3RlLXJlcGxhY2UtZG91YmxlCiAgIFlvdSBjYW4gYWxzbyBzZXQgdGhlIG9wdGlvbiBA Y29kZXtlbGVjdHJpYy1xdW90ZS1yZXBsYWNlLWRvdWJsZX0gdG8KLWEgbm9uLUBjb2Rle25p bH0gdmFsdWUuICBUaGVuLCB0eXBpbmcgQHR7In0gaW5zZXJ0IGFuIGFwcHJvcHJpYXRlCith IG5vbi1AY29kZXtuaWx9IHZhbHVlLiAgVGhlbiwgdHlwaW5nIEBrYmR7In0gaW5zZXJ0IGFu IGFwcHJvcHJpYXRlCiBjdXJ2ZWQgZG91YmxlIHF1b3RlIGRlcGVuZGluZyBvbiBjb250ZXh0 OiBAdHvigJx9IGF0IHRoZSBiZWdpbm5pbmcgb2YKIHRoZSBidWZmZXIgb3IgYWZ0ZXIgYSBs aW5lIGJyZWFrLCB3aGl0ZXNwYWNlLCBvcGVuaW5nIHBhcmVudGhlc2lzLCBvcgogcXVvdGUg Y2hhcmFjdGVyLCBhbmQgQHR74oCdfSBvdGhlcndpc2UuCkBAIC00NzMsNyArNDcyLDcgQEAK IHR5cGUgQGtiZHtDLXEgYH0gb3IgQGtiZHtDLXEgJ30gaW5zdGVhZCBvZiBAa2Jke2B9IG9y IEBrYmR7J30uICBUbwogaW5zZXJ0IGEgY3VydmVkIHF1b3RlIGV2ZW4gd2hlbiBFbGVjdHJp YyBRdW90ZSBpcyBkaXNhYmxlZCBvcgogaW5hY3RpdmUsIHlvdSBjYW4gdHlwZSBAa2Jke0Mt eCA4IFt9IGZvciBAdHvigJh9LCBAa2Jke0MteCA4IF19IGZvcgotQHR74oCZfSwgQGtiZHtD LXggOCBAe30gZm9yIGBgLCBhbmQgQGtiZHtDLXggOCBAfX0gZm9yICcnLgorQHR74oCZfSwg QGtiZHtDLXggOCBAe30gZm9yIEB0e+KAnH0sIGFuZCBAa2Jke0MteCA4IEB9fSBmb3IgQHR7 4oCdfS4KIEB4cmVme0luc2VydGluZyBUZXh0fS4gIE5vdGUgdGhhdCB0aGUgdmFsdWUgb2YK IEBjb2Rle2VsZWN0cmljLXF1b3RlLWNoYXJzfSBkb2VzIG5vdCBhZmZlY3QgdGhlc2Uga2V5 YmluZGluZ3MsIHRoZXkKIGFyZSBub3Qga2V5YmluZGluZ3Mgb2YgQGNvZGV7ZWxlY3RyaWMt cXVvdGUtbW9kZX0gYnV0IGJvdW5kIGluCg== --------------09A6DF47614A63E377A800E4--