From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#51993: 29.0.50; [PATCH] Killing emacsclient terminal with `server-stop-automatically' doesn't prompt to save files Date: Mon, 28 Nov 2022 21:31:02 -0800 Message-ID: References: <9e47c871-a2c3-d764-bec9-d87abf3efe83@gmail.com> <79a53ecc-dbfc-d088-d80d-96f349be794a@gmail.com> <834k7vw2vb.fsf@gnu.org> <87czc4tosz.fsf@gnus.org> <83lepoi58p.fsf@gnu.org> <83y1tbxbbt.fsf@gnu.org> <83h6zxwujo.fsf@gnu.org> <2738f071-c87f-72cf-226f-6e8597cb07a8@gmail.com> <83a65ouz0e.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------wFUCLtGrkwCqjitYWCG16Gkd" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9085"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 51993@debbugs.gnu.org, gregory@heytings.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 06:32:26 2022 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 1oztEH-00028k-OY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 06:32:25 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oztDz-0002cd-EN; Tue, 29 Nov 2022 00:32:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oztDv-0002aN-Kd for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 00:32:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oztDv-0006HX-AC for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 00:32:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oztDu-0003bc-30 for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 00:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 05:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51993 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51993-submit@debbugs.gnu.org id=B51993.166969987313850 (code B ref 51993); Tue, 29 Nov 2022 05:32:02 +0000 Original-Received: (at 51993) by debbugs.gnu.org; 29 Nov 2022 05:31:13 +0000 Original-Received: from localhost ([127.0.0.1]:53182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oztD6-0003bK-AU for submit@debbugs.gnu.org; Tue, 29 Nov 2022 00:31:12 -0500 Original-Received: from mail-pl1-f180.google.com ([209.85.214.180]:41905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oztD3-0003bE-SX for 51993@debbugs.gnu.org; Tue, 29 Nov 2022 00:31:10 -0500 Original-Received: by mail-pl1-f180.google.com with SMTP id io19so12348990plb.8 for <51993@debbugs.gnu.org>; Mon, 28 Nov 2022 21:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=HiTgwRJSY9su1z1l9h37VOB9mGPt+DpWZBvkmVuof/o=; b=HlcCgxfx/YPDcY0clo6K0D+PQ4V0r0LYkBDDJg6EGQKDCH/2aerw7cC1YFZ+zkyzrY M/mBGNYvlH71d/2kRMzjyPg9q1O6qRUX4nFaMyTISYcUfMir56nUJXOTdAb337eI8eHD 0zSSaPa8zTZSjfrRTQhvllGU5tiqYYipcoXudB92j7n/I4tMUOc66wQcxd0mMasGqZOE qHMi+jplbl6VuB24xzHYe/BBs8feOdlrAhkFi7jk8G4xDbDqGT2ZZMUmQ72NBpRV7LRx 6yNkYX0MIpWFAVyh8H2Ju1+D+Y8uU9KWqUFzx5e1pp5dcwWFphOIpCEnQj4krjVhNoPI FWsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=HiTgwRJSY9su1z1l9h37VOB9mGPt+DpWZBvkmVuof/o=; b=TKFsEVmIFB2a6zMt46bsd77sPaowPi9A5Jwj/5fl7gr2YCecnqAFstuMKokDitqGXw zwz6c1IAITBvY7HXM12jo8CNiFMXT/OWCBdsf5FnpD1EY0FuO89lAKFz1zXzy4C4xhYy aNB49oHUve2saygrqiOdpvozk6DhMa32PFM88FETWnbzMhhn5x8RiNiAeHFxwwfo64m9 obvobcE81vYjKEe5v5PW8injGz2I/0Ng+JPkkJogA7mFCiP7J0NHb+jpxbSKgqdULQ9k vHvnn1zH4wOalWYN54sqajkGMBji/6tnbQbQRXqsBVwgtiXR2eo9vRRA+ABRQ+4qyDm/ 9/Bw== X-Gm-Message-State: ANoB5pm3sDaYKBO0FdmJth5IRtiFcjzuhd92hzoeHp8BGtpzD7tFQki2 CJaZ3wCG16ee2pUgF5aqzSA= X-Google-Smtp-Source: AA0mqf7XhedoylHeKzxzD2hDLNdeHATaF/HbfvP+aZM3BUkOlHidObzgf4zGSbCN5YRVzUIKv0N2Ag== X-Received: by 2002:a17:902:8217:b0:186:a5a7:cc3d with SMTP id x23-20020a170902821700b00186a5a7cc3dmr34952592pln.42.1669699863857; Mon, 28 Nov 2022 21:31:03 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id b14-20020a170902650e00b0016d773aae60sm9791365plk.19.2022.11.28.21.31.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Nov 2022 21:31:02 -0800 (PST) Content-Language: en-US In-Reply-To: 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249366 Archived-At: This is a multi-part message in MIME format. --------------wFUCLtGrkwCqjitYWCG16Gkd Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/24/2022 8:10 PM, Jim Porter wrote: > On 10/21/2022 11:57 PM, Eli Zaretskii wrote: >>> Date: Fri, 21 Oct 2022 20:46:47 -0700 >>> Cc: larsi@gnus.org, 51993@debbugs.gnu.org, gregory@heytings.org >>> From: Jim Porter >>> >>> The issue in the quote above is that if you enable automatic server >>> shutdown in Emacs 29, it changes the behavior of exiting an emacsclient >>> even when it wouldn't stop the server (i.e. when there are other active >>> clients). That's surprising to me, I wouldn't expect that setting to >>> affect cases when it decides *not* to kill the Emacs daemon. >> >> Sounds like a bug to me, because it contradicts what the doc string >> says. > > That's how it seems to me too. ... Ok, after quite a delay, here's a patch for this. Previously, the function 'server-stop-automatically--handle-delete-frame' responded to both 'C-x C-c' ('save-buffers-kill-terminal') and 'delete-frame', which made it more complex. I've moved the 'C-x C-c' case into 'server-save-buffers-kill-terminal', which simplifies 'server-stop-automatically--handle-delete-frame'. The updated 'server-save-buffers-kill-terminal' should now make sure that the new stop-automatically behavior only happens when there are no other client processes (or nowait frames). I've also attached a version of the diff excluding the whitespace changes to make reviewing the code easier. --------------wFUCLtGrkwCqjitYWCG16Gkd Content-Type: text/plain; charset=UTF-8; name="0001-Make-killing-a-non-last-client-work-the-same-no-matt.patch" Content-Disposition: attachment; filename*0="0001-Make-killing-a-non-last-client-work-the-same-no-matt.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyYzA5NDBhODZjZDExZWJhZDBkMWVhN2ZjZjhmZTJlOWNmYmMwZmIzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjggTm92IDIwMjIgMjE6MTc6NTkgLTA4MDAKU3ViamVjdDogW1BB VENIXSBNYWtlIGtpbGxpbmcgYSBub24tbGFzdCBjbGllbnQgd29yayB0aGUgc2FtZSBubyBt YXR0ZXIgdGhlCiBhdXRvLXN0b3Agc2V0dGluZwoKUHJldmlvdXNseSwgaWYgJ3NlcnZlci1z dG9wLWF1dG9tYXRpY2FsbHknIHdhcyBjb25maWd1cmVkIGZvcgona2lsbC10ZXJtaW5hbCcg b3IgJ2RlbGV0ZS1mcmFtZScsIGtpbGxpbmcgYSBjbGllbnQgdmlhCidzYXZlLWJ1ZmZlcnMt a2lsbC10ZXJtaW5hbCcgd291bGRuJ3QgcHJvbXB0IGFib3V0IHRoZSBzYXZpbmcgZmlsZXMg aW4KdGhlIGNsaWVudCdzIGJ1ZmZlciBsaXN0IChhcyBpdCBkb2VzIHdoZW4gbm90IHVzaW5n IHRob3NlIHNldHRpbmdzKS4KVGhpcyBjaGFuZ2UgZW5zdXJlcyB0aGF0IHRob3NlIHNldHRp bmdzIG9ubHkgYXBwbHkgd2hlbiBraWxsaW5nIHRoZQpsYXN0IGNsaWVudCwgYXMgZGVzY3Jp YmVkIGluIHRoZSBtYW51YWwgKGJ1ZyM1MTk5MykuCgoqIGxpc3Avc2VydmVyLmVsIChzZXJ2 ZXItc2F2ZS1idWZmZXJzLWtpbGwtdGVybWluYWwpOiBIYW5kbGUKJ3NlcnZlci1zdG9wLWF1 dG9tYXRpY2FsbHknIGJlaGF2aW9yIGluIHRoaXMgZnVuY3Rpb24sIHJhdGhlciB0aGFuCmNh bGxpbmcgJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLWhhbmRsZS1kZWxldGUtZnJhbWUn Lgooc2VydmVyLXN0b3AtYXV0b21hdGljYWxseS0taGFuZGxlLWRlbGV0ZS1mcmFtZSk6IFJl bW92ZSBjb2RlIHRoYXQKaGFuZGxlZCB0aGUgJ3NhdmUtYnVmZmVycy1raWxsLXRlcm1pbmFs JyBjYXNlLgotLS0KIGxpc3Avc2VydmVyLmVsIHwgODMgKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MCBpbnNl cnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3NlcnZlci5l bCBiL2xpc3Avc2VydmVyLmVsCmluZGV4IDFiMDI3Zjg4Y2UuLmU4OGNmZmE4ZmIgMTAwNjQ0 Ci0tLSBhL2xpc3Avc2VydmVyLmVsCisrKyBiL2xpc3Avc2VydmVyLmVsCkBAIC0xNzgwLDUy ICsxNzgwLDQ5IEBAIHNlcnZlci1zYXZlLWJ1ZmZlcnMta2lsbC10ZXJtaW5hbAogCiBJZiBl bWFjc2NsaWVudCB3YXMgc3RhcnRlZCB3aXRoIGEgbGlzdCBvZiBmaWxlbmFtZXMgdG8gZWRp dCwgdGhlbgogb25seSB0aGVzZSBmaWxlcyB3aWxsIGJlIGFza2VkIHRvIGJlIHNhdmVkLiIK LSAgKGlmIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkKLSAgICAgIChzZXJ2ZXItc3RvcC1h dXRvbWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRlLWZyYW1lIChzZWxlY3RlZC1mcmFtZSkpCi0g ICAgKGxldCAoKHByb2MgKGZyYW1lLXBhcmFtZXRlciBuaWwgJ2NsaWVudCkpKQotICAgICAg KGNvbmQgKChlcSBwcm9jICdub3dhaXQpCi0JICAgICA7OyBOb3dhaXQgZnJhbWVzIGhhdmUg bm8gY2xpZW50IGJ1ZmZlciBsaXN0LgotCSAgICAgKGlmIChjZHIgKGZyYW1lLWxpc3QpKQot CSAgICAgICAgIChwcm9nbiAoc2F2ZS1zb21lLWJ1ZmZlcnMgYXJnKQotCQkgICAgICAgIChk ZWxldGUtZnJhbWUpKQotCSAgICAgICA7OyBJZiB3ZSdyZSB0aGUgbGFzdCBmcmFtZSBzdGFu ZGluZywga2lsbCBFbWFjcy4KLQkgICAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzIGFy ZykpKQotCSAgICAoKHByb2Nlc3NwIHByb2MpCi0JICAgICAobGV0ICgoYnVmZmVycyAocHJv Y2Vzcy1nZXQgcHJvYyAnYnVmZmVycykpKQotCSAgICAgICAoc2F2ZS1zb21lLWJ1ZmZlcnMK LQkgICAgICAgIGFyZyAoaWYgYnVmZmVycwotICAgICAgICAgICAgICAgICAgICAgICAgOzsg T25seSBmaWxlcyBmcm9tIGVtYWNzY2xpZW50IGZpbGUgbGlzdC4KLQkJICAgICAgICAobGFt YmRhICgpIChtZW1xIChjdXJyZW50LWJ1ZmZlcikgYnVmZmVycykpCi0gICAgICAgICAgICAg ICAgICAgICAgOzsgTm8gZW1hY3NjbGllbnQgZmlsZSBsaXN0OiBkb24ndCBvdmVycmlkZQot ICAgICAgICAgICAgICAgICAgICAgIDs7IGBzYXZlLXNvbWUtYnVmZmVycy1kZWZhdWx0LXBy ZWRpY2F0ZScgKHVubGVzcwotICAgICAgICAgICAgICAgICAgICAgIDs7IEFSRyBpcyBub24t bmlsKSwgc2luY2Ugd2UncmUgbm90IGtpbGxpbmcKLSAgICAgICAgICAgICAgICAgICAgICA7 OyBFbWFjcyAodW5saWtlIGBzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcycpLgotCQkgICAgICAo YW5kIGFyZyB0KSkpCi0JICAgICAgIChzZXJ2ZXItZGVsZXRlLWNsaWVudCBwcm9jKSkpCi0J ICAgICh0IChlcnJvciAiSW52YWxpZCBjbGllbnQgZnJhbWUiKSkpKSkpCisgIChsZXQgKChw cm9jIChmcmFtZS1wYXJhbWV0ZXIgbmlsICdjbGllbnQpKSkKKyAgICAoY29uZCAoKGVxIHBy b2MgJ25vd2FpdCkKKwkgICA7OyBOb3dhaXQgZnJhbWVzIGhhdmUgbm8gY2xpZW50IGJ1ZmZl ciBsaXN0LgorCSAgIChpZiAobGVuZ3RoPiAoZnJhbWUtbGlzdCkgKGlmIHNlcnZlci1zdG9w LWF1dG9tYXRpY2FsbHkgMiAxKSkKKyAgICAgICAgICAgICAgIDs7IElmIHRoZXJlIGFyZSBh bnkgb3RoZXIgZnJhbWVzLCBvbmx5IGRlbGV0ZSB0aGlzIG9uZS4KKyAgICAgICAgICAgICAg IDs7IFdoZW4gYHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknIGlzIHNldCwgZG9uJ3QgY291 bnQKKyAgICAgICAgICAgICAgIDs7IHRoZSBkYWVtb24gZnJhbWUuCisJICAgICAgIChwcm9n biAoc2F2ZS1zb21lLWJ1ZmZlcnMgYXJnKQorCQkgICAgICAoZGVsZXRlLWZyYW1lKSkKKwkg ICAgIDs7IElmIHdlJ3JlIHRoZSBsYXN0IGZyYW1lIHN0YW5kaW5nLCBraWxsIEVtYWNzLgor CSAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzIGFyZykpKQorCSAgKChwcm9jZXNzcCBw cm9jKQorICAgICAgICAgICAoaWYgKG9yIChub3Qgc2VydmVyLXN0b3AtYXV0b21hdGljYWxs eSkKKyAgICAgICAgICAgICAgICAgICAobGVuZ3RoPiBzZXJ2ZXItY2xpZW50cyAxKQorICAg ICAgICAgICAgICAgICAgIChzZXEtc29tZQorICAgICAgICAgICAgICAgICAgICAobGFtYmRh IChmcmFtZSkKKyAgICAgICAgICAgICAgICAgICAgICAod2hlbi1sZXQgKChwIChmcmFtZS1w YXJhbWV0ZXIgZnJhbWUgJ2NsaWVudCkpKQorICAgICAgICAgICAgICAgICAgICAgICAgKG5v dCAoZXEgcHJvYyBwKSkpKQorICAgICAgICAgICAgICAgICAgICAoZnJhbWUtbGlzdCkpKQor CSAgICAgICAobGV0ICgoYnVmZmVycyAocHJvY2Vzcy1nZXQgcHJvYyAnYnVmZmVycykpKQor CSAgICAgICAgIChzYXZlLXNvbWUtYnVmZmVycworCSAgICAgICAgICBhcmcgKGlmIGJ1ZmZl cnMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgT25seSBmaWxlcyBmcm9tIGVtYWNz Y2xpZW50IGZpbGUgbGlzdC4KKwkJICAgICAgICAgIChsYW1iZGEgKCkgKG1lbXEgKGN1cnJl bnQtYnVmZmVyKSBidWZmZXJzKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIDs7IE5vIGVt YWNzY2xpZW50IGZpbGUgbGlzdDogZG9uJ3Qgb3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAg ICAgICAgIDs7IGBzYXZlLXNvbWUtYnVmZmVycy1kZWZhdWx0LXByZWRpY2F0ZScgKHVubGVz cworICAgICAgICAgICAgICAgICAgICAgICAgOzsgQVJHIGlzIG5vbi1uaWwpLCBzaW5jZSB3 ZSdyZSBub3Qga2lsbGluZworICAgICAgICAgICAgICAgICAgICAgICAgOzsgRW1hY3MgKHVu bGlrZSBgc2F2ZS1idWZmZXJzLWtpbGwtZW1hY3MnKS4KKwkJICAgICAgICAoYW5kIGFyZyB0 KSkpCisJICAgICAgICAgKHNlcnZlci1kZWxldGUtY2xpZW50IHByb2MpKQorICAgICAgICAg ICAgIDs7IElmIGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpcyBzZXQsIHRoZXJlIGFy ZSBubworICAgICAgICAgICAgIDs7IG90aGVyIGNsaWVudCBwcm9jZXNzZXMsIGFuZCBubyBv dGhlciBjbGllbnQgZnJhbWVzCisgICAgICAgICAgICAgOzsgKGUuZy4gYG5vd2FpdCcgZnJh bWVzKSwga2lsbCBFbWFjcy4KKyAgICAgICAgICAgICAoc2F2ZS1idWZmZXJzLWtpbGwtZW1h Y3MgYXJnKSkpCisJICAodCAoZXJyb3IgIkludmFsaWQgY2xpZW50IGZyYW1lIikpKSkpCiAK IChkZWZ1biBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRlLWZyYW1l IChmcmFtZSkKICAgIkhhbmRsZSBkZWxldGlvbiBvZiBGUkFNRSB3aGVuIGBzZXJ2ZXItc3Rv cC1hdXRvbWF0aWNhbGx5JyBpcyB1c2VkLiIKLSAgKHdoZW4gc2VydmVyLXN0b3AtYXV0b21h dGljYWxseQotICAgIChpZiAoaWYgKGFuZCAocHJvY2Vzc3AgKGZyYW1lLXBhcmFtZXRlciBm cmFtZSAnY2xpZW50KSkKLQkJIChlcSB0aGlzLWNvbW1hbmQgJ3NhdmUtYnVmZmVycy1raWxs LXRlcm1pbmFsKSkKLQkgICAgKHByb2duCi0JICAgICAgKGRvbGlzdCAoZiAoZnJhbWUtbGlz dCkpCi0JCSh3aGVuIChhbmQgKGVxIChmcmFtZS1wYXJhbWV0ZXIgZnJhbWUgJ2NsaWVudCkK LQkJCSAgICAgICAoZnJhbWUtcGFyYW1ldGVyIGYgJ2NsaWVudCkpCi0JCQkgICAobm90IChl cSBmcmFtZSBmKSkpCi0JCSAgKHNldC1mcmFtZS1wYXJhbWV0ZXIgZiAnY2xpZW50IG5pbCkK LQkJICAobGV0ICgoc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSBuaWwpKQotCQkgICAgKGRl bGV0ZS1mcmFtZSBmKSkpKQotCSAgICAgIChpZiAoY2RkciAoZnJhbWUtbGlzdCkpCi0JCSAg KGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmlsKSkKLQkJICAgIChkZWxldGUt ZnJhbWUgZnJhbWUpCi0JCSAgICBuaWwpCi0JCXQpKQotCSAgKG51bGwgKGNkZHIgKGZyYW1l LWxpc3QpKSkpCi0JKGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmlsKSkKLQkg IChzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcykKLQkgIChkZWxldGUtZnJhbWUgZnJhbWUpKSkp KQorICAod2hlbiAoYW5kIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkKKyAgICAgICAgICAg ICAobnVsbCAoY2RkciAoZnJhbWUtbGlzdCkpKSkKKyAgICAobGV0ICgoc2VydmVyLXN0b3At YXV0b21hdGljYWxseSBuaWwpKQorICAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzKQor ICAgICAgKGRlbGV0ZS1mcmFtZSBmcmFtZSkpKSkKIAogKGRlZnVuIHNlcnZlci1zdG9wLWF1 dG9tYXRpY2FsbHktLW1heWJlLWtpbGwtZW1hY3MgKCkKICAgIkhhbmRsZSBjbG9zaW5nIG9m IEVtYWNzIGRhZW1vbiB3aGVuIGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpcyB1c2Vk LiIKLS0gCjIuMjUuMQoK --------------wFUCLtGrkwCqjitYWCG16Gkd Content-Type: text/plain; charset=UTF-8; name="no-whitespace-change.diff" Content-Disposition: attachment; filename="no-whitespace-change.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3Avc2VydmVyLmVsIGIvbGlzcC9zZXJ2ZXIuZWwKaW5kZXggMWIw MjdmODhjZS4uZTg4Y2ZmYThmYiAxMDA2NDQKLS0tIGEvbGlzcC9zZXJ2ZXIuZWwKKysrIGIv bGlzcC9zZXJ2ZXIuZWwKQEAgLTE3ODAsMTcgKzE3ODAsMjUgQEAgc2VydmVyLXNhdmUtYnVm ZmVycy1raWxsLXRlcm1pbmFsCiAKIElmIGVtYWNzY2xpZW50IHdhcyBzdGFydGVkIHdpdGgg YSBsaXN0IG9mIGZpbGVuYW1lcyB0byBlZGl0LCB0aGVuCiBvbmx5IHRoZXNlIGZpbGVzIHdp bGwgYmUgYXNrZWQgdG8gYmUgc2F2ZWQuIgotICAoaWYgc2VydmVyLXN0b3AtYXV0b21hdGlj YWxseQotICAgICAgKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLWhhbmRsZS1kZWxldGUt ZnJhbWUgKHNlbGVjdGVkLWZyYW1lKSkKICAgKGxldCAoKHByb2MgKGZyYW1lLXBhcmFtZXRl ciBuaWwgJ2NsaWVudCkpKQogICAgIChjb25kICgoZXEgcHJvYyAnbm93YWl0KQogCSAgIDs7 IE5vd2FpdCBmcmFtZXMgaGF2ZSBubyBjbGllbnQgYnVmZmVyIGxpc3QuCi0JICAgICAoaWYg KGNkciAoZnJhbWUtbGlzdCkpCisJICAgKGlmIChsZW5ndGg+IChmcmFtZS1saXN0KSAoaWYg c2VydmVyLXN0b3AtYXV0b21hdGljYWxseSAyIDEpKQorICAgICAgICAgICAgICAgOzsgSWYg dGhlcmUgYXJlIGFueSBvdGhlciBmcmFtZXMsIG9ubHkgZGVsZXRlIHRoaXMgb25lLgorICAg ICAgICAgICAgICAgOzsgV2hlbiBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScgaXMgc2V0 LCBkb24ndCBjb3VudAorICAgICAgICAgICAgICAgOzsgdGhlIGRhZW1vbiBmcmFtZS4KIAkg ICAgICAgKHByb2duIChzYXZlLXNvbWUtYnVmZmVycyBhcmcpCiAJCSAgICAgIChkZWxldGUt ZnJhbWUpKQogCSAgICAgOzsgSWYgd2UncmUgdGhlIGxhc3QgZnJhbWUgc3RhbmRpbmcsIGtp bGwgRW1hY3MuCiAJICAgICAoc2F2ZS1idWZmZXJzLWtpbGwtZW1hY3MgYXJnKSkpCiAJICAo KHByb2Nlc3NwIHByb2MpCisgICAgICAgICAgIChpZiAob3IgKG5vdCBzZXJ2ZXItc3RvcC1h dXRvbWF0aWNhbGx5KQorICAgICAgICAgICAgICAgICAgIChsZW5ndGg+IHNlcnZlci1jbGll bnRzIDEpCisgICAgICAgICAgICAgICAgICAgKHNlcS1zb21lCisgICAgICAgICAgICAgICAg ICAgIChsYW1iZGEgKGZyYW1lKQorICAgICAgICAgICAgICAgICAgICAgICh3aGVuLWxldCAo KHAgKGZyYW1lLXBhcmFtZXRlciBmcmFtZSAnY2xpZW50KSkpCisgICAgICAgICAgICAgICAg ICAgICAgICAobm90IChlcSBwcm9jIHApKSkpCisgICAgICAgICAgICAgICAgICAgIChmcmFt ZS1saXN0KSkpCiAJICAgICAgIChsZXQgKChidWZmZXJzIChwcm9jZXNzLWdldCBwcm9jICdi dWZmZXJzKSkpCiAJICAgICAgICAgKHNhdmUtc29tZS1idWZmZXJzCiAJICAgICAgICAgIGFy ZyAoaWYgYnVmZmVycwpAQCAtMTgwMSwzMSArMTgwOSwyMCBAQCBzZXJ2ZXItc2F2ZS1idWZm ZXJzLWtpbGwtdGVybWluYWwKICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEFSRyBpcyBu b24tbmlsKSwgc2luY2Ugd2UncmUgbm90IGtpbGxpbmcKICAgICAgICAgICAgICAgICAgICAg ICAgIDs7IEVtYWNzICh1bmxpa2UgYHNhdmUtYnVmZmVycy1raWxsLWVtYWNzJykuCiAJCSAg ICAgICAgKGFuZCBhcmcgdCkpKQotCSAgICAgICAoc2VydmVyLWRlbGV0ZS1jbGllbnQgcHJv YykpKQotCSAgICAodCAoZXJyb3IgIkludmFsaWQgY2xpZW50IGZyYW1lIikpKSkpKQorCSAg ICAgICAgIChzZXJ2ZXItZGVsZXRlLWNsaWVudCBwcm9jKSkKKyAgICAgICAgICAgICA7OyBJ ZiBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScgaXMgc2V0LCB0aGVyZSBhcmUgbm8KKyAg ICAgICAgICAgICA7OyBvdGhlciBjbGllbnQgcHJvY2Vzc2VzLCBhbmQgbm8gb3RoZXIgY2xp ZW50IGZyYW1lcworICAgICAgICAgICAgIDs7IChlLmcuIGBub3dhaXQnIGZyYW1lcyksIGtp bGwgRW1hY3MuCisgICAgICAgICAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzIGFyZykp KQorCSAgKHQgKGVycm9yICJJbnZhbGlkIGNsaWVudCBmcmFtZSIpKSkpKQogCiAoZGVmdW4g c2VydmVyLXN0b3AtYXV0b21hdGljYWxseS0taGFuZGxlLWRlbGV0ZS1mcmFtZSAoZnJhbWUp CiAgICJIYW5kbGUgZGVsZXRpb24gb2YgRlJBTUUgd2hlbiBgc2VydmVyLXN0b3AtYXV0b21h dGljYWxseScgaXMgdXNlZC4iCi0gICh3aGVuIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkK LSAgICAoaWYgKGlmIChhbmQgKHByb2Nlc3NwIChmcmFtZS1wYXJhbWV0ZXIgZnJhbWUgJ2Ns aWVudCkpCi0JCSAoZXEgdGhpcy1jb21tYW5kICdzYXZlLWJ1ZmZlcnMta2lsbC10ZXJtaW5h bCkpCi0JICAgIChwcm9nbgotCSAgICAgIChkb2xpc3QgKGYgKGZyYW1lLWxpc3QpKQotCQko d2hlbiAoYW5kIChlcSAoZnJhbWUtcGFyYW1ldGVyIGZyYW1lICdjbGllbnQpCi0JCQkgICAg ICAgKGZyYW1lLXBhcmFtZXRlciBmICdjbGllbnQpKQotCQkJICAgKG5vdCAoZXEgZnJhbWUg ZikpKQotCQkgIChzZXQtZnJhbWUtcGFyYW1ldGVyIGYgJ2NsaWVudCBuaWwpCi0JCSAgKGxl dCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmlsKSkKLQkJICAgIChkZWxldGUtZnJh bWUgZikpKSkKLQkgICAgICAoaWYgKGNkZHIgKGZyYW1lLWxpc3QpKQotCQkgIChsZXQgKChz ZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5IG5pbCkpCi0JCSAgICAoZGVsZXRlLWZyYW1lIGZy YW1lKQotCQkgICAgbmlsKQotCQl0KSkKKyAgKHdoZW4gKGFuZCBzZXJ2ZXItc3RvcC1hdXRv bWF0aWNhbGx5CiAgICAgICAgICAgICAgKG51bGwgKGNkZHIgKGZyYW1lLWxpc3QpKSkpCiAg ICAgKGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmlsKSkKICAgICAgIChzYXZl LWJ1ZmZlcnMta2lsbC1lbWFjcykKLQkgIChkZWxldGUtZnJhbWUgZnJhbWUpKSkpKQorICAg ICAgKGRlbGV0ZS1mcmFtZSBmcmFtZSkpKSkKIAogKGRlZnVuIHNlcnZlci1zdG9wLWF1dG9t YXRpY2FsbHktLW1heWJlLWtpbGwtZW1hY3MgKCkKICAgIkhhbmRsZSBjbG9zaW5nIG9mIEVt YWNzIGRhZW1vbiB3aGVuIGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpcyB1c2VkLiIK --------------wFUCLtGrkwCqjitYWCG16Gkd--