From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#16196: 24.3.50; Disable ding when scrolling Date: Fri, 9 Aug 2019 09:55:03 +0200 Message-ID: References: <25C13650-058F-45CC-A961-D789709B1179@swipnet.se> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000009aeb01058faa7eaf" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="125118"; mail-complaints-to="usenet@blaine.gmane.org" Cc: "16196@debbugs.gnu.org" <16196@debbugs.gnu.org>, Jan =?UTF-8?Q?Dj=C3=A4rv?= To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 09 09:56:18 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hvzl3-000WOQ-Qx for geb-bug-gnu-emacs@m.gmane.org; Fri, 09 Aug 2019 09:56:18 +0200 Original-Received: from localhost ([::1]:57170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvzl2-0001da-IR for geb-bug-gnu-emacs@m.gmane.org; Fri, 09 Aug 2019 03:56:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60049) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvzko-0001cr-Rn for bug-gnu-emacs@gnu.org; Fri, 09 Aug 2019 03:56:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvzko-0004Pp-09 for bug-gnu-emacs@gnu.org; Fri, 09 Aug 2019 03:56:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvzkn-0004P1-Lv for bug-gnu-emacs@gnu.org; Fri, 09 Aug 2019 03:56:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hvzkn-0004gn-IG for bug-gnu-emacs@gnu.org; Fri, 09 Aug 2019 03:56:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <25C13650-058F-45CC-A961-D789709B1179@swipnet.se> Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 09 Aug 2019 07:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16196 X-GNU-PR-Package: emacs Original-Received: via spool by 16196-submit@debbugs.gnu.org id=B16196.156533732317978 (code B ref 16196); Fri, 09 Aug 2019 07:56:01 +0000 Original-Received: (at 16196) by debbugs.gnu.org; 9 Aug 2019 07:55:23 +0000 Original-Received: from localhost ([127.0.0.1]:42020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvzkB-0004fu-Av for submit@debbugs.gnu.org; Fri, 09 Aug 2019 03:55:23 -0400 Original-Received: from mail-pf1-f179.google.com ([209.85.210.179]:37350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvzk8-0004fh-SM for 16196@debbugs.gnu.org; Fri, 09 Aug 2019 03:55:21 -0400 Original-Received: by mail-pf1-f179.google.com with SMTP id 19so45592246pfa.4 for <16196@debbugs.gnu.org>; Fri, 09 Aug 2019 00:55:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=LIIJcROYj6e0Giy7os1HaNmSoKHuXTbYoBWzLja8+PQ=; b=jChJZhkASAFkmDPu8nBHCSfREJCHN2d2uCHLYtr+vSLrnEioqqgU3DSqcHW5KRdvEm Jngm2WH3AXY/186xDz4ZeKfQKINzBlLRpC4Mh8CjtTThY1jMzLZ8e7Hwovzc9UbDZP6/ 5fn0FFZhfSTYzcawE8OoROchwxoHI1mAIlfRBmxhVhNucQIu7/J5ipWtk0xdDJQBcte/ /KvnQ+OVo4Zv66B+YmwBHrzumwZm8mJpAAuRIdQ/EbE7vvmS0vduK2efetUtCU2xakvn JnWbNGEoF1s+BxsOW06D4WCIb9ByKywI/N7nD7tYa7QWiACn9sHTxLqw8hvLanXz9mtt uUhw== X-Gm-Message-State: APjAAAX+6at7MrfTUyIzm4XKW5l1hYAJM6fyHOds+YbWf55Ao5IpFhH9 UMzO0FEpdD5X4RoWahEnUZFneQuspzbCebce0qw= X-Google-Smtp-Source: APXvYqy2E1xDESW6CJU9QXP3jxRbpE48vr9u9PkDCh0JQ+jC2Mv/gNlkiPSmSIW/lcRJG/DjU6/asqwdfGBS7aMgHdI= X-Received: by 2002:a17:90a:9488:: with SMTP id s8mr8370775pjo.2.1565337314816; Fri, 09 Aug 2019 00:55:14 -0700 (PDT) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:164793 Archived-At: --0000000000009aeb01058faa7eaf Content-Type: text/plain; charset="UTF-8" Stefan Monnier writes: >>> So the question is: which kind of feedback should we use instead? >>> I'd rather keep some kind of feedback. Maybe a `message'? >> As we do already. > > Indeed! I didn't notice it because the (ding) drowns it out. > >> Just suppress the additional beep. > > Sounds OK. Can someone provide a patch to mwheel.el? I took a stab at this. The attached patch traps the beginning-of-buffer and end-of-buffer errors and shows a message instead as suggested above. To make it easier to review, I've also included a git diff ignoring whitespace changes. What do you think? Best regards, Stefan Kangas --0000000000009aeb01058faa7eaf Content-Type: application/octet-stream; name="0001-Make-mouse-scroll-show-a-message-instead-of-dinging-.patch" Content-Disposition: attachment; filename="0001-Make-mouse-scroll-show-a-message-instead-of-dinging-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jz3t7jdb0 RnJvbSBiOTZhMzRhZGNlMmM0OTRmMDI2NTZiMmVlODE5NDJmYzkyMTZiMjk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBGcmksIDkgQXVnIDIwMTkgMDk6Mzk6MTYgKzAyMDAKU3ViamVjdDogW1BBVENIXSBN YWtlIG1vdXNlIHNjcm9sbCBzaG93IGEgbWVzc2FnZSBpbnN0ZWFkIG9mIGRpbmdpbmcgYXQgYnVm ZmVyCiBsaW1pdHMKCiogbGlzcC9td2hlZWwuZWwgKG13aGVlbC1zY3JvbGwpOiBTaG93IGEgbWVz c2FnZSBpbnN0ZWFkIG9mIGRpbmdpbmcgYXQKZW5kIG9mIGJ1ZmZlciBhbmQgYmVnaW5uaW5nIG9m IGJ1ZmZlci4gIFRoaXMgc2hvdWxkIGJlIGxlc3MgaW50cnVzaXZlLAplc3BlY2lhbGx5IHdoZW4g dXNpbmcgYSB0cmFja3BhZC4gIChCdWcjMTYxOTYpCi0tLQogbGlzcC9td2hlZWwuZWwgfCAxOTYg KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDEwMiBpbnNlcnRpb25zKCspLCA5NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9saXNwL213aGVlbC5lbCBiL2xpc3AvbXdoZWVsLmVsCmluZGV4IGRmZWE1NTM3NGIuLjM0ZTQ2 NjhiNWEgMTAwNjQ0Ci0tLSBhL2xpc3AvbXdoZWVsLmVsCisrKyBiL2xpc3AvbXdoZWVsLmVsCkBA IC0yMDgsMTAwICsyMDgsMTA4IEBAIG13aGVlbC1zY3JvbGwKIFRoaXMgc2hvdWxkIGJlIGJvdW5k IG9ubHkgdG8gbW91c2UgYnV0dG9ucyA0LCA1LCA2LCBhbmQgNyBvbgogbm9uLVdpbmRvd3Mgc3lz dGVtcy4iCiAgIChpbnRlcmFjdGl2ZSAobGlzdCBsYXN0LWlucHV0LWV2ZW50KSkKLSAgKGxldCog KChzZWxlY3RlZC13aW5kb3cgKHNlbGVjdGVkLXdpbmRvdykpCi0gICAgICAgICAoc2Nyb2xsLXdp bmRvdwotICAgICAgICAgIChvciAoY2F0Y2ggJ2ZvdW5kCi0gICAgICAgICAgICAgICAgKGxldCog KCh3aW5kb3cgKGlmIG1vdXNlLXdoZWVsLWZvbGxvdy1tb3VzZQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAobXdoZWVsLWV2ZW50LXdpbmRvdyBldmVudCkKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChzZWxlY3RlZC13aW5kb3cpKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgKGZyYW1lICh3aGVuICh3aW5kb3ctbGl2ZS1wIHdpbmRvdykKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZyYW1lLXBhcmFtZXRlcgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKHdpbmRvdy1mcmFtZSB3aW5kb3cpICdtb3VzZS13aGVlbC1mcmFtZSkp KSkKLSAgICAgICAgICAgICAgICAgICh3aGVuIChmcmFtZS1saXZlLXAgZnJhbWUpCi0gICAgICAg ICAgICAgICAgICAgIChsZXQqICgocG9zIChtb3VzZS1hYnNvbHV0ZS1waXhlbC1wb3NpdGlvbikp Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAocG9zLXggKGNhciBwb3MpKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHBvcy15IChjZHIgcG9zKSkpCi0gICAgICAgICAgICAgICAgICAg ICAgKHdhbGstd2luZG93LXRyZWUKLSAgICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAod2lu ZG93LTEpCi0gICAgICAgICAgICAgICAgICAgICAgICAgKGxldCAoKGVkZ2VzICh3aW5kb3ctZWRn ZXMgd2luZG93LTEgbmlsIHQgdCkpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4g KGFuZCAoPD0gKG50aCAwIGVkZ2VzKSBwb3MteCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKDw9IHBvcy14IChudGggMiBlZGdlcykpCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICg8PSAobnRoIDEgZWRnZXMpIHBvcy15KQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoPD0gcG9zLXkgKG50aCAzIGVkZ2VzKSkpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICh0aHJvdyAnZm91bmQgd2luZG93LTEpKSkpCi0gICAg ICAgICAgICAgICAgICAgICAgIGZyYW1lIG5pbCB0KSkpKSkKLSAgICAgICAgICAgICAgKG13aGVl bC1ldmVudC13aW5kb3cgZXZlbnQpKSkKLQkgKG9sZC1wb2ludAotICAgICAgICAgIChhbmQgKGVx IHNjcm9sbC13aW5kb3cgc2VsZWN0ZWQtd2luZG93KQotCSAgICAgICAoZXEgKGNhci1zYWZlIHRy YW5zaWVudC1tYXJrLW1vZGUpICdvbmx5KQotCSAgICAgICAod2luZG93LXBvaW50KSkpCi0gICAg ICAgICAobW9kcwotCSAgKGRlbHEgJ2NsaWNrIChkZWxxICdkb3VibGUgKGRlbHEgJ3RyaXBsZSAo ZXZlbnQtbW9kaWZpZXJzIGV2ZW50KSkpKSkKLSAgICAgICAgIChhbXQgKGFzc29jIG1vZHMgbW91 c2Utd2hlZWwtc2Nyb2xsLWFtb3VudCkpKQotICAgICh1bmxlc3MgKGVxIHNjcm9sbC13aW5kb3cg c2VsZWN0ZWQtd2luZG93KQotICAgICAgOzsgTWFyayB3aW5kb3cgdG8gYmUgc2Nyb2xsZWQgZm9y IHJlZGlzcGxheS4KLSAgICAgIChzZWxlY3Qtd2luZG93IHNjcm9sbC13aW5kb3cgJ21hcmstZm9y LXJlZGlzcGxheSkpCi0gICAgOzsgRXh0cmFjdCB0aGUgYWN0dWFsIGFtb3VudCBvciBmaW5kIHRo ZSBlbGVtZW50IHRoYXQgaGFzIG5vIG1vZGlmaWVycy4KLSAgICAoaWYgYW10IChzZXRxIGFtdCAo Y2RyIGFtdCkpCi0gICAgICAobGV0ICgobGlzdC1lbHQgbW91c2Utd2hlZWwtc2Nyb2xsLWFtb3Vu dCkpCi0JKHdoaWxlIChjb25zcCAoc2V0cSBhbXQgKHBvcCBsaXN0LWVsdCkpKSkpKQotICAgIChp ZiAoZmxvYXRwIGFtdCkgKHNldHEgYW10ICgxKyAodHJ1bmNhdGUgKCogYW10ICh3aW5kb3ctaGVp Z2h0KSkpKSkpCi0gICAgKHdoZW4gKGFuZCBtb3VzZS13aGVlbC1wcm9ncmVzc2l2ZS1zcGVlZCAo bnVtYmVycCBhbXQpKQotICAgICAgOzsgV2hlbiB0aGUgZG91YmxlLW1vdXNlLU4gY29tZXMgaW4s IGEgbW91c2UtTiBoYXMgYmVlbiBleGVjdXRlZCBhbHJlYWR5LAotICAgICAgOzsgU28gYnkgYWRk aW5nIHRoaW5ncyB1cCB3ZSBnZXQgYSBzcXVhcmluZyB1cCAoMSwgMywgNiwgMTAsIDE1LCAuLi4p LgotICAgICAgKHNldHEgYW10ICgqIGFtdCAoZXZlbnQtY2xpY2stY291bnQgZXZlbnQpKSkpCi0g ICAgKHdoZW4gKG51bWJlcnAgYW10KSAoc2V0cSBhbXQgKCogYW10IChldmVudC1saW5lLWNvdW50 IGV2ZW50KSkpKQotICAgICh1bndpbmQtcHJvdGVjdAotCShsZXQgKChidXR0b24gKG13aGVlbC1l dmVudC1idXR0b24gZXZlbnQpKSkKLQkgIChjb25kICgoZXEgYnV0dG9uIG1vdXNlLXdoZWVsLWRv d24tZXZlbnQpCi0gICAgICAgICAgICAgICAgIChjb25kaXRpb24tY2FzZSBuaWwgKGZ1bmNhbGwg bXdoZWVsLXNjcm9sbC1kb3duLWZ1bmN0aW9uIGFtdCkKLSAgICAgICAgICAgICAgICAgICA7OyBN YWtlIHN1cmUgd2UgZG8gaW5kZWVkIHNjcm9sbCB0byB0aGUgYmVnaW5uaW5nIG9mCi0gICAgICAg ICAgICAgICAgICAgOzsgdGhlIGJ1ZmZlci4KLSAgICAgICAgICAgICAgICAgICAoYmVnaW5uaW5n LW9mLWJ1ZmZlcgotICAgICAgICAgICAgICAgICAgICAodW53aW5kLXByb3RlY3QKLSAgICAgICAg ICAgICAgICAgICAgICAgIChmdW5jYWxsIG13aGVlbC1zY3JvbGwtZG93bi1mdW5jdGlvbikKLSAg ICAgICAgICAgICAgICAgICAgICA7OyBJZiB0aGUgZmlyc3Qgc2Nyb2xsIHN1Y2NlZWRlZCwgdGhl biBzb21lIHNjcm9sbGluZwotICAgICAgICAgICAgICAgICAgICAgIDs7IGlzIHBvc3NpYmxlOiBr ZWVwIHNjcm9sbGluZyB0aWwgdGhlIGJlZ2lubmluZyBidXQKLSAgICAgICAgICAgICAgICAgICAg ICA7OyBkbyBub3Qgc2lnbmFsIGFuIGVycm9yLiAgRm9yIHNvbWUgcmVhc29uLCB3ZSBoYXZlCi0g ICAgICAgICAgICAgICAgICAgICAgOzsgdG8gZG8gaXQgZXZlbiBpZiB0aGUgZmlyc3Qgc2Nyb2xs IHNpZ25hbGVkIGFuCi0gICAgICAgICAgICAgICAgICAgICAgOzsgZXJyb3IsIGJlY2F1c2Ugb3Ro ZXJ3aXNlIHRoZSB3aW5kb3cgaXMgcmVjZW50ZXJlZAotICAgICAgICAgICAgICAgICAgICAgIDs7 IGZvciBhIHJlYXNvbiB0aGF0IGVzY2FwZXMgbWUuICBUaGlzIHByb2JsZW0gc2VlbXMKLSAgICAg ICAgICAgICAgICAgICAgICA7OyB0byBvbmx5IGFmZmVjdCBzY3JvbGwtZG93bi4gIC0tU3RlZgot ICAgICAgICAgICAgICAgICAgICAgIChzZXQtd2luZG93LXN0YXJ0IChzZWxlY3RlZC13aW5kb3cp IChwb2ludC1taW4pKSkpKSkKLQkJKChlcSBidXR0b24gbW91c2Utd2hlZWwtdXAtZXZlbnQpCi0g ICAgICAgICAgICAgICAgIChjb25kaXRpb24tY2FzZSBuaWwgKGZ1bmNhbGwgbXdoZWVsLXNjcm9s bC11cC1mdW5jdGlvbiBhbXQpCi0gICAgICAgICAgICAgICAgICAgOzsgTWFrZSBzdXJlIHdlIGRv IGluZGVlZCBzY3JvbGwgdG8gdGhlIGVuZCBvZiB0aGUgYnVmZmVyLgotICAgICAgICAgICAgICAg ICAgIChlbmQtb2YtYnVmZmVyICh3aGlsZSB0IChmdW5jYWxsIG13aGVlbC1zY3JvbGwtdXAtZnVu Y3Rpb24pKSkpKQotICAgICAgICAgICAgICAgICgoZXEgYnV0dG9uIG1vdXNlLXdoZWVsLWxlZnQt ZXZlbnQpIDsgZm9yIHRpbHQgc2Nyb2xsCi0gICAgICAgICAgICAgICAgICh3aGVuIG1vdXNlLXdo ZWVsLXRpbHQtc2Nyb2xsCi0gICAgICAgICAgICAgICAgICAgKGZ1bmNhbGwgKGlmIG1vdXNlLXdo ZWVsLWZsaXAtZGlyZWN0aW9uCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG13aGVl bC1zY3JvbGwtcmlnaHQtZnVuY3Rpb24KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG13 aGVlbC1zY3JvbGwtbGVmdC1mdW5jdGlvbikgYW10KSkpCi0gICAgICAgICAgICAgICAgKChlcSBi dXR0b24gbW91c2Utd2hlZWwtcmlnaHQtZXZlbnQpIDsgZm9yIHRpbHQgc2Nyb2xsCi0gICAgICAg ICAgICAgICAgICh3aGVuIG1vdXNlLXdoZWVsLXRpbHQtc2Nyb2xsCi0gICAgICAgICAgICAgICAg ICAgKGZ1bmNhbGwgKGlmIG1vdXNlLXdoZWVsLWZsaXAtZGlyZWN0aW9uCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG13aGVlbC1zY3JvbGwtbGVmdC1mdW5jdGlvbgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbXdoZWVsLXNjcm9sbC1yaWdodC1mdW5jdGlvbikgYW10KSkp Ci0JCSh0IChlcnJvciAiQmFkIGJpbmRpbmcgaW4gbXdoZWVsLXNjcm9sbCIpKSkpCi0gICAgICAo aWYgKGVxIHNjcm9sbC13aW5kb3cgc2VsZWN0ZWQtd2luZG93KQotCSAgOzsgSWYgdGhlcmUgaXMg YSB0ZW1wb3JhcmlseSBhY3RpdmUgcmVnaW9uLCBkZWFjdGl2YXRlIGl0IGlmCi0JICA7OyBzY3Jv bGxpbmcgbW92ZWQgcG9pbnQuCi0JICAod2hlbiAoYW5kIG9sZC1wb2ludCAoLz0gb2xkLXBvaW50 ICh3aW5kb3ctcG9pbnQpKSkKLQkgICAgOzsgQ2FsbCBgZGVhY3RpdmF0ZS1tYXJrJyBhdCB0aGUg b3JpZ2luYWwgcG9zaXRpb24sIHNvIHRoYXQKLQkgICAgOzsgdGhlIG9yaWdpbmFsIHJlZ2lvbiBp cyBzYXZlZCB0byB0aGUgWCBzZWxlY3Rpb24uCi0JICAgIChsZXQgKChuZXctcG9pbnQgKHdpbmRv dy1wb2ludCkpKQotCSAgICAgIChnb3RvLWNoYXIgb2xkLXBvaW50KQotCSAgICAgIChkZWFjdGl2 YXRlLW1hcmspCi0JICAgICAgKGdvdG8tY2hhciBuZXctcG9pbnQpKSkKLQkoc2VsZWN0LXdpbmRv dyBzZWxlY3RlZC13aW5kb3cgdCkpKSkKLQotICAod2hlbiAoYW5kIG1vdXNlLXdoZWVsLWNsaWNr LWV2ZW50IG1vdXNlLXdoZWVsLWluaGliaXQtY2xpY2stdGltZSkKLSAgICAoaWYgbXdoZWVsLWlu aGliaXQtY2xpY2stZXZlbnQtdGltZXIKLQkoY2FuY2VsLXRpbWVyIG13aGVlbC1pbmhpYml0LWNs aWNrLWV2ZW50LXRpbWVyKQotICAgICAgKGFkZC1ob29rICdwcmUtY29tbWFuZC1ob29rICdtd2hl ZWwtZmlsdGVyLWNsaWNrLWV2ZW50cykpCi0gICAgKHNldHEgbXdoZWVsLWluaGliaXQtY2xpY2st ZXZlbnQtdGltZXIKLQkgIChydW4td2l0aC10aW1lciBtb3VzZS13aGVlbC1pbmhpYml0LWNsaWNr LXRpbWUgbmlsCi0JCQkgICdtd2hlZWwtaW5oaWJpdC1jbGljay10aW1lb3V0KSkpKQorICAobGV0 IChzYXctZXJyb3IpCisgICAgKGxldCogKChzZWxlY3RlZC13aW5kb3cgKHNlbGVjdGVkLXdpbmRv dykpCisgICAgICAgICAgIChzY3JvbGwtd2luZG93CisgICAgICAgICAgICAob3IgKGNhdGNoICdm b3VuZAorICAgICAgICAgICAgICAgICAgKGxldCogKCh3aW5kb3cgKGlmIG1vdXNlLXdoZWVsLWZv bGxvdy1tb3VzZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtd2hlZWwt ZXZlbnQtd2luZG93IGV2ZW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo c2VsZWN0ZWQtd2luZG93KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgKGZyYW1lICh3aGVu ICh3aW5kb3ctbGl2ZS1wIHdpbmRvdykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoZnJhbWUtcGFyYW1ldGVyCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3 aW5kb3ctZnJhbWUgd2luZG93KSAnbW91c2Utd2hlZWwtZnJhbWUpKSkpCisgICAgICAgICAgICAg ICAgICAgICh3aGVuIChmcmFtZS1saXZlLXAgZnJhbWUpCisgICAgICAgICAgICAgICAgICAgICAg KGxldCogKChwb3MgKG1vdXNlLWFic29sdXRlLXBpeGVsLXBvc2l0aW9uKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHBvcy14IChjYXIgcG9zKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHBvcy15IChjZHIgcG9zKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAod2Fs ay13aW5kb3ctdHJlZQorICAgICAgICAgICAgICAgICAgICAgICAgIChsYW1iZGEgKHdpbmRvdy0x KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxldCAoKGVkZ2VzICh3aW5kb3ctZWRnZXMg d2luZG93LTEgbmlsIHQgdCkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAod2hlbiAo YW5kICg8PSAobnRoIDAgZWRnZXMpIHBvcy14KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICg8PSBwb3MteCAobnRoIDIgZWRnZXMpKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICg8PSAobnRoIDEgZWRnZXMpIHBvcy15KQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICg8PSBwb3MteSAobnRoIDMgZWRnZXMpKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodGhyb3cgJ2ZvdW5kIHdpbmRvdy0xKSkp KQorICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lIG5pbCB0KSkpKSkKKyAgICAgICAgICAg ICAgICAobXdoZWVsLWV2ZW50LXdpbmRvdyBldmVudCkpKQorCSAgIChvbGQtcG9pbnQKKyAgICAg ICAgICAgIChhbmQgKGVxIHNjcm9sbC13aW5kb3cgc2VsZWN0ZWQtd2luZG93KQorCSAgICAgICAg IChlcSAoY2FyLXNhZmUgdHJhbnNpZW50LW1hcmstbW9kZSkgJ29ubHkpCisJICAgICAgICAgKHdp bmRvdy1wb2ludCkpKQorICAgICAgICAgICAobW9kcworCSAgICAoZGVscSAnY2xpY2sgKGRlbHEg J2RvdWJsZSAoZGVscSAndHJpcGxlIChldmVudC1tb2RpZmllcnMgZXZlbnQpKSkpKQorICAgICAg ICAgICAoYW10IChhc3NvYyBtb2RzIG1vdXNlLXdoZWVsLXNjcm9sbC1hbW91bnQpKSkKKyAgICAg ICh1bmxlc3MgKGVxIHNjcm9sbC13aW5kb3cgc2VsZWN0ZWQtd2luZG93KQorICAgICAgICA7OyBN YXJrIHdpbmRvdyB0byBiZSBzY3JvbGxlZCBmb3IgcmVkaXNwbGF5LgorICAgICAgICAoc2VsZWN0 LXdpbmRvdyBzY3JvbGwtd2luZG93ICdtYXJrLWZvci1yZWRpc3BsYXkpKQorICAgICAgOzsgRXh0 cmFjdCB0aGUgYWN0dWFsIGFtb3VudCBvciBmaW5kIHRoZSBlbGVtZW50IHRoYXQgaGFzIG5vIG1v ZGlmaWVycy4KKyAgICAgIChpZiBhbXQgKHNldHEgYW10IChjZHIgYW10KSkKKyAgICAgICAgKGxl dCAoKGxpc3QtZWx0IG1vdXNlLXdoZWVsLXNjcm9sbC1hbW91bnQpKQorCSAgKHdoaWxlIChjb25z cCAoc2V0cSBhbXQgKHBvcCBsaXN0LWVsdCkpKSkpKQorICAgICAgKGlmIChmbG9hdHAgYW10KSAo c2V0cSBhbXQgKDErICh0cnVuY2F0ZSAoKiBhbXQgKHdpbmRvdy1oZWlnaHQpKSkpKSkKKyAgICAg ICh3aGVuIChhbmQgbW91c2Utd2hlZWwtcHJvZ3Jlc3NpdmUtc3BlZWQgKG51bWJlcnAgYW10KSkK KyAgICAgICAgOzsgV2hlbiB0aGUgZG91YmxlLW1vdXNlLU4gY29tZXMgaW4sIGEgbW91c2UtTiBo YXMgYmVlbiBleGVjdXRlZCBhbHJlYWR5LAorICAgICAgICA7OyBTbyBieSBhZGRpbmcgdGhpbmdz IHVwIHdlIGdldCBhIHNxdWFyaW5nIHVwICgxLCAzLCA2LCAxMCwgMTUsIC4uLikuCisgICAgICAg IChzZXRxIGFtdCAoKiBhbXQgKGV2ZW50LWNsaWNrLWNvdW50IGV2ZW50KSkpKQorICAgICAgKHdo ZW4gKG51bWJlcnAgYW10KSAoc2V0cSBhbXQgKCogYW10IChldmVudC1saW5lLWNvdW50IGV2ZW50 KSkpKQorICAgICAgKGNvbmRpdGlvbi1jYXNlIG5pbAorICAgICAgICAgICh1bndpbmQtcHJvdGVj dAorCSAgICAgIChsZXQgKChidXR0b24gKG13aGVlbC1ldmVudC1idXR0b24gZXZlbnQpKSkKKwkg ICAgICAgIChjb25kICgoZXEgYnV0dG9uIG1vdXNlLXdoZWVsLWRvd24tZXZlbnQpCisgICAgICAg ICAgICAgICAgICAgICAgIChjb25kaXRpb24tY2FzZSBuaWwgKGZ1bmNhbGwgbXdoZWVsLXNjcm9s bC1kb3duLWZ1bmN0aW9uIGFtdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICA7OyBNYWtlIHN1 cmUgd2UgZG8gaW5kZWVkIHNjcm9sbCB0byB0aGUgYmVnaW5uaW5nIG9mCisgICAgICAgICAgICAg ICAgICAgICAgICAgOzsgdGhlIGJ1ZmZlci4KKyAgICAgICAgICAgICAgICAgICAgICAgICAoYmVn aW5uaW5nLW9mLWJ1ZmZlcgorICAgICAgICAgICAgICAgICAgICAgICAgICAodW53aW5kLXByb3Rl Y3QKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmdW5jYWxsIG13aGVlbC1zY3JvbGwt ZG93bi1mdW5jdGlvbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBJZiB0aGUgZmly c3Qgc2Nyb2xsIHN1Y2NlZWRlZCwgdGhlbiBzb21lIHNjcm9sbGluZworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDs7IGlzIHBvc3NpYmxlOiBrZWVwIHNjcm9sbGluZyB0aWwgdGhlIGJlZ2lu bmluZyBidXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBkbyBub3Qgc2lnbmFsIGFu IGVycm9yLiAgRm9yIHNvbWUgcmVhc29uLCB3ZSBoYXZlCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgOzsgdG8gZG8gaXQgZXZlbiBpZiB0aGUgZmlyc3Qgc2Nyb2xsIHNpZ25hbGVkIGFuCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgZXJyb3IsIGJlY2F1c2Ugb3RoZXJ3aXNlIHRo ZSB3aW5kb3cgaXMgcmVjZW50ZXJlZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IGZv ciBhIHJlYXNvbiB0aGF0IGVzY2FwZXMgbWUuICBUaGlzIHByb2JsZW0gc2VlbXMKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICA7OyB0byBvbmx5IGFmZmVjdCBzY3JvbGwtZG93bi4gIC0tU3Rl ZgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzZXQtd2luZG93LXN0YXJ0IChzZWxlY3Rl ZC13aW5kb3cpIChwb2ludC1taW4pKSkpKSkKKwkJICAgICAgKChlcSBidXR0b24gbW91c2Utd2hl ZWwtdXAtZXZlbnQpCisgICAgICAgICAgICAgICAgICAgICAgIChjb25kaXRpb24tY2FzZSBuaWwg KGZ1bmNhbGwgbXdoZWVsLXNjcm9sbC11cC1mdW5jdGlvbiBhbXQpCisgICAgICAgICAgICAgICAg ICAgICAgICAgOzsgTWFrZSBzdXJlIHdlIGRvIGluZGVlZCBzY3JvbGwgdG8gdGhlIGVuZCBvZiB0 aGUgYnVmZmVyLgorICAgICAgICAgICAgICAgICAgICAgICAgIChlbmQtb2YtYnVmZmVyICh3aGls ZSB0IChmdW5jYWxsIG13aGVlbC1zY3JvbGwtdXAtZnVuY3Rpb24pKSkpKQorICAgICAgICAgICAg ICAgICAgICAgICgoZXEgYnV0dG9uIG1vdXNlLXdoZWVsLWxlZnQtZXZlbnQpIDsgZm9yIHRpbHQg c2Nyb2xsCisgICAgICAgICAgICAgICAgICAgICAgICh3aGVuIG1vdXNlLXdoZWVsLXRpbHQtc2Ny b2xsCisgICAgICAgICAgICAgICAgICAgICAgICAgKGZ1bmNhbGwgKGlmIG1vdXNlLXdoZWVsLWZs aXAtZGlyZWN0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG13aGVl bC1zY3JvbGwtcmlnaHQtZnVuY3Rpb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG13aGVlbC1zY3JvbGwtbGVmdC1mdW5jdGlvbikgYW10KSkpCisgICAgICAgICAgICAgICAg ICAgICAgKChlcSBidXR0b24gbW91c2Utd2hlZWwtcmlnaHQtZXZlbnQpIDsgZm9yIHRpbHQgc2Ny b2xsCisgICAgICAgICAgICAgICAgICAgICAgICh3aGVuIG1vdXNlLXdoZWVsLXRpbHQtc2Nyb2xs CisgICAgICAgICAgICAgICAgICAgICAgICAgKGZ1bmNhbGwgKGlmIG1vdXNlLXdoZWVsLWZsaXAt ZGlyZWN0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG13aGVlbC1z Y3JvbGwtbGVmdC1mdW5jdGlvbgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bXdoZWVsLXNjcm9sbC1yaWdodC1mdW5jdGlvbikgYW10KSkpCisJCSAgICAgICh0IChlcnJvciAi QmFkIGJpbmRpbmcgaW4gbXdoZWVsLXNjcm9sbCIpKSkpCisgICAgICAgICAgICAoaWYgKGVxIHNj cm9sbC13aW5kb3cgc2VsZWN0ZWQtd2luZG93KQorICAgICAgICAgICAgICAgIDs7IElmIHRoZXJl IGlzIGEgdGVtcG9yYXJpbHkgYWN0aXZlIHJlZ2lvbiwgZGVhY3RpdmF0ZSBpdCBpZgorICAgICAg ICAgICAgICAgIDs7IHNjcm9sbGluZyBtb3ZlZCBwb2ludC4KKwkgICAgICAgICh3aGVuIChhbmQg b2xkLXBvaW50ICgvPSBvbGQtcG9pbnQgKHdpbmRvdy1wb2ludCkpKQorICAgICAgICAgICAgICAg ICAgOzsgQ2FsbCBgZGVhY3RpdmF0ZS1tYXJrJyBhdCB0aGUgb3JpZ2luYWwgcG9zaXRpb24sIHNv IHRoYXQKKyAgICAgICAgICAgICAgICAgIDs7IHRoZSBvcmlnaW5hbCByZWdpb24gaXMgc2F2ZWQg dG8gdGhlIFggc2VsZWN0aW9uLgorCSAgICAgICAgICAobGV0ICgobmV3LXBvaW50ICh3aW5kb3ct cG9pbnQpKSkKKwkgICAgICAgICAgICAoZ290by1jaGFyIG9sZC1wb2ludCkKKwkgICAgICAgICAg ICAoZGVhY3RpdmF0ZS1tYXJrKQorCSAgICAgICAgICAgIChnb3RvLWNoYXIgbmV3LXBvaW50KSkp CisJICAgICAgKHNlbGVjdC13aW5kb3cgc2VsZWN0ZWQtd2luZG93IHQpKSkKKyAgICAgICAgOzsg RG8gbm90IGRpbmcgYXQgYnVmZmVyIGxpbWl0cy4gIFNob3cgYSBtZXNzYWdlIGluc3RlYWQuCisg ICAgICAgIChiZWdpbm5pbmctb2YtYnVmZmVyIChtZXNzYWdlICJCZWdpbm5pbmcgb2YgYnVmZmVy IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNldHEgc2F3LWVycm9yIHQpKQorICAg ICAgICAoZW5kLW9mLWJ1ZmZlciAobWVzc2FnZSAiRW5kIG9mIGJ1ZmZlciIpCisgICAgICAgICAg ICAgICAgICAgICAgIChzZXRxIHNhdy1lcnJvciB0KSkpKQorCisgICAgKHdoZW4gKGFuZCAobm90 IHNhdy1lcnJvcikKKyAgICAgICAgICAgICAgIG1vdXNlLXdoZWVsLWNsaWNrLWV2ZW50IG1vdXNl LXdoZWVsLWluaGliaXQtY2xpY2stdGltZSkKKyAgICAgIChpZiBtd2hlZWwtaW5oaWJpdC1jbGlj ay1ldmVudC10aW1lcgorICAgICAgICAgIChjYW5jZWwtdGltZXIgbXdoZWVsLWluaGliaXQtY2xp Y2stZXZlbnQtdGltZXIpCisgICAgICAgIChhZGQtaG9vayAncHJlLWNvbW1hbmQtaG9vayAnbXdo ZWVsLWZpbHRlci1jbGljay1ldmVudHMpKQorICAgICAgKHNldHEgbXdoZWVsLWluaGliaXQtY2xp Y2stZXZlbnQtdGltZXIKKyAgICAgICAgICAgIChydW4td2l0aC10aW1lciBtb3VzZS13aGVlbC1p bmhpYml0LWNsaWNrLXRpbWUgbmlsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ213aGVl bC1pbmhpYml0LWNsaWNrLXRpbWVvdXQpKSkpKQogCiAocHV0ICdtd2hlZWwtc2Nyb2xsICdzY3Jv bGwtY29tbWFuZCB0KQogCi0tIAoyLjIyLjAKCg== --0000000000009aeb01058faa7eaf Content-Type: application/octet-stream; name="bug-16196-no-ws.diff" Content-Disposition: attachment; filename="bug-16196-no-ws.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jz3tbt4i1 ZGlmZiAtLWdpdCBhL2xpc3AvbXdoZWVsLmVsIGIvbGlzcC9td2hlZWwuZWwKaW5kZXggZGZlYTU1 Mzc0Yi4uMzRlNDY2OGI1YSAxMDA2NDQKLS0tIGEvbGlzcC9td2hlZWwuZWwKKysrIGIvbGlzcC9t d2hlZWwuZWwKQEAgLTIwOCw2ICsyMDgsNyBAQCBtd2hlZWwtc2Nyb2xsCiBUaGlzIHNob3VsZCBi ZSBib3VuZCBvbmx5IHRvIG1vdXNlIGJ1dHRvbnMgNCwgNSwgNiwgYW5kIDcgb24KIG5vbi1XaW5k b3dzIHN5c3RlbXMuIgogICAoaW50ZXJhY3RpdmUgKGxpc3QgbGFzdC1pbnB1dC1ldmVudCkpCisg IChsZXQgKHNhdy1lcnJvcikKICAgICAobGV0KiAoKHNlbGVjdGVkLXdpbmRvdyAoc2VsZWN0ZWQt d2luZG93KSkKICAgICAgICAgICAgKHNjcm9sbC13aW5kb3cKICAgICAgICAgICAgIChvciAoY2F0 Y2ggJ2ZvdW5kCkBAIC0yNTEsNiArMjUyLDcgQEAgbXdoZWVsLXNjcm9sbAogICAgICAgICA7OyBT byBieSBhZGRpbmcgdGhpbmdzIHVwIHdlIGdldCBhIHNxdWFyaW5nIHVwICgxLCAzLCA2LCAxMCwg MTUsIC4uLikuCiAgICAgICAgIChzZXRxIGFtdCAoKiBhbXQgKGV2ZW50LWNsaWNrLWNvdW50IGV2 ZW50KSkpKQogICAgICAgKHdoZW4gKG51bWJlcnAgYW10KSAoc2V0cSBhbXQgKCogYW10IChldmVu dC1saW5lLWNvdW50IGV2ZW50KSkpKQorICAgICAgKGNvbmRpdGlvbi1jYXNlIG5pbAogICAgICAg ICAgICh1bndpbmQtcHJvdGVjdAogCSAgICAgIChsZXQgKChidXR0b24gKG13aGVlbC1ldmVudC1i dXR0b24gZXZlbnQpKSkKIAkgICAgICAgIChjb25kICgoZXEgYnV0dG9uIG1vdXNlLXdoZWVsLWRv d24tZXZlbnQpCkBAIC0yOTMsMTUgKzI5NSwyMSBAQCBtd2hlZWwtc2Nyb2xsCiAJICAgICAgICAg ICAgKGdvdG8tY2hhciBvbGQtcG9pbnQpCiAJICAgICAgICAgICAgKGRlYWN0aXZhdGUtbWFyaykK IAkgICAgICAgICAgICAoZ290by1jaGFyIG5ldy1wb2ludCkpKQotCShzZWxlY3Qtd2luZG93IHNl bGVjdGVkLXdpbmRvdyB0KSkpKQotCi0gICh3aGVuIChhbmQgbW91c2Utd2hlZWwtY2xpY2stZXZl bnQgbW91c2Utd2hlZWwtaW5oaWJpdC1jbGljay10aW1lKQorCSAgICAgIChzZWxlY3Qtd2luZG93 IHNlbGVjdGVkLXdpbmRvdyB0KSkpCisgICAgICAgIDs7IERvIG5vdCBkaW5nIGF0IGJ1ZmZlciBs aW1pdHMuICBTaG93IGEgbWVzc2FnZSBpbnN0ZWFkLgorICAgICAgICAoYmVnaW5uaW5nLW9mLWJ1 ZmZlciAobWVzc2FnZSAiQmVnaW5uaW5nIG9mIGJ1ZmZlciIpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChzZXRxIHNhdy1lcnJvciB0KSkKKyAgICAgICAgKGVuZC1vZi1idWZmZXIgKG1l c3NhZ2UgIkVuZCBvZiBidWZmZXIiKQorICAgICAgICAgICAgICAgICAgICAgICAoc2V0cSBzYXct ZXJyb3IgdCkpKSkKKworICAgICh3aGVuIChhbmQgKG5vdCBzYXctZXJyb3IpCisgICAgICAgICAg ICAgICBtb3VzZS13aGVlbC1jbGljay1ldmVudCBtb3VzZS13aGVlbC1pbmhpYml0LWNsaWNrLXRp bWUpCiAgICAgICAoaWYgbXdoZWVsLWluaGliaXQtY2xpY2stZXZlbnQtdGltZXIKICAgICAgICAg ICAoY2FuY2VsLXRpbWVyIG13aGVlbC1pbmhpYml0LWNsaWNrLWV2ZW50LXRpbWVyKQogICAgICAg ICAoYWRkLWhvb2sgJ3ByZS1jb21tYW5kLWhvb2sgJ213aGVlbC1maWx0ZXItY2xpY2stZXZlbnRz KSkKICAgICAgIChzZXRxIG13aGVlbC1pbmhpYml0LWNsaWNrLWV2ZW50LXRpbWVyCiAgICAgICAg ICAgICAocnVuLXdpdGgtdGltZXIgbW91c2Utd2hlZWwtaW5oaWJpdC1jbGljay10aW1lIG5pbAot CQkJICAnbXdoZWVsLWluaGliaXQtY2xpY2stdGltZW91dCkpKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnbXdoZWVsLWluaGliaXQtY2xpY2stdGltZW91dCkpKSkpCiAKIChwdXQgJ213 aGVlbC1zY3JvbGwgJ3Njcm9sbC1jb21tYW5kIHQpCiAK --0000000000009aeb01058faa7eaf--