From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#12169: Acknowledgement ([PATCH] Merge changes from upstream ruby-mode) Date: Fri, 10 Aug 2012 18:52:30 +0400 Message-ID: <5025202E.70507@yandex.ru> References: <50245771.6060109@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010109080102090103020402" X-Trace: dough.gmane.org 1344610388 30120 80.91.229.3 (10 Aug 2012 14:53:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 10 Aug 2012 14:53:08 +0000 (UTC) To: 12169@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 10 16:53:07 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Szqa8-0001bK-2o for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Aug 2012 16:52:56 +0200 Original-Received: from localhost ([::1]:35342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Szqa7-0005Bl-BR for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Aug 2012 10:52:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Szqa0-0005BG-RH for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 10:52:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzqZy-0006rX-U5 for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 10:52:48 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzqZy-0006rF-LJ for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 10:52:46 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Szqhx-0006pf-UF for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 11:01:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 10 Aug 2012 15:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12169 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 12169-submit@debbugs.gnu.org id=B12169.134461085026246 (code B ref 12169); Fri, 10 Aug 2012 15:01:01 +0000 Original-Received: (at 12169) by debbugs.gnu.org; 10 Aug 2012 15:00:50 +0000 Original-Received: from localhost ([127.0.0.1]:47066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Szqhl-0006pG-QH for submit@debbugs.gnu.org; Fri, 10 Aug 2012 11:00:50 -0400 Original-Received: from forward17.mail.yandex.net ([95.108.253.142]:59192) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Szqhh-0006p4-SQ for 12169@debbugs.gnu.org; Fri, 10 Aug 2012 11:00:48 -0400 Original-Received: from smtp18.mail.yandex.net (smtp18.mail.yandex.net [95.108.252.18]) by forward17.mail.yandex.net (Yandex) with ESMTP id EBB781060B7B for <12169@debbugs.gnu.org>; Fri, 10 Aug 2012 18:52:28 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1344610348; bh=i2WhmMyIGYe+Y8lrsbWMomg+p0nRaLp/4jxad+4Vkso=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type; b=PvmL5EnbIygjT7gqOseeizUh0v0ihnM+6KCyFVuiKpCwjkGWaowvrSjTXdSXvO1ih FhDaFgphPUM+IaOnuYE7r++aJEOHWQUrfywHHBcoCp55QDvz73pSKEXkPxND18NKlR mahXAQEcjXokNy/wM/skcCDuZ8LUoNuPHLHCAcGM= Original-Received: from smtp18.mail.yandex.net (localhost [127.0.0.1]) by smtp18.mail.yandex.net (Yandex) with ESMTP id D72D418A05F0 for <12169@debbugs.gnu.org>; Fri, 10 Aug 2012 18:52:28 +0400 (MSK) Original-Received: from 98-87.nwlink.spb.ru (98-87.nwlink.spb.ru [178.252.98.87]) by smtp18.mail.yandex.net (nwsmtp/Yandex) with ESMTP id qSJeFrD0-qSJGtJ9b; Fri, 10 Aug 2012 18:52:28 +0400 X-Yandex-Rcpt-Suid: 12169@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1344610348; bh=i2WhmMyIGYe+Y8lrsbWMomg+p0nRaLp/4jxad+4Vkso=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: References:In-Reply-To:Content-Type; b=ZkCs0KPVMTCQ/pnK+MBjWHCEvUcCk3HuhsgTUmxmVpQjXs8AA1G+0iYxX2xjQxR1g VPnmlFfeKv2DyZ6T/wUnIFUL2ZmgolPvUeUZSFjIhKZCbLXLPwXizRUyqfLYcUhjMK 9JZosvGJkCpUmJKZDmuc0roGl6fOEHzfiGIqCk34= User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:14.0) Gecko/20120713 Thunderbird/14.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63004 Archived-At: This is a multi-part message in MIME format. --------------010109080102090103020402 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Here's part 2, in which I'm skipping the next 3 commits: https://github.com/ruby/ruby/commit/85df40e9ab4559cd4ddde3f106ab56c76a808cc8 https://github.com/ruby/ruby/commit/6b0dc7fd81b25bc66681548b8b82f38258f7e08c https://github.com/ruby/ruby/commit/862048e28d26112af1e67205cfd1c16564590bce Because as far as I can tell, they hijack the `ruby-deep-indent-paren' behavior. IOW, with these applied, the indentation works as though the above variable is always nil (with a small improvement in the nested case, to be fair), so they don't make sense. Instead, I added two tests, for `ruby-deep-indent-paren' enabled and disabled, and also ported all examples from test/misc/test_ruby_mode.rb. --------------010109080102090103020402 Content-Type: text/plain; charset=windows-1251; name="ruby-upstream-2.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ruby-upstream-2.diff" ZGlmZiAtLWdpdCBhL3Rlc3QvQ2hhbmdlTG9nIGIvdGVzdC9DaGFuZ2VMb2cKaW5kZXggODZm MzAxOS4uYzU5YzNjYiAxMDA2NDQKLS0tIGEvdGVzdC9DaGFuZ2VMb2cKKysrIGIvdGVzdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMi0wOC0xMCAgRG1pdHJ5IEd1dG92ICA8 ZGd1dG92QHlhbmRleC5ydT4KKworCSogYXV0b21hdGVkL3J1YnktbW9kZS10ZXN0cy5lbCAo cnVieS1zaG91bGQtaW5kZW50KTogQWRkCisJZG9jc3RyaW5nLCBjaGVjayAoY3VycmVudC1p bmRlbnRhdGlvbikgaW5zdGVhZCBvZiAoY3VycmVudC1jb2x1bW4pLgorCShydWJ5LXNob3Vs ZC1pbmRlbnQtYnVmZmVyKTogTmV3IGZ1bmN0aW9uLgorCUFkZCB0ZXN0cyBmb3IgYHJ1Ynkt ZGVlcC1pbmRlbnQtcGFyZW4nIGJlaGF2aW9yLgorCVBvcnQgYWxsIHRlc3RzIGZyb20gdGVz dC9taXNjL3Rlc3RfcnVieV9tb2RlLnJiIGluIFJ1YnkgcmVwby4KKwogMjAxMi0wOC0wOSAg RG1pdHJ5IEd1dG92ICA8ZGd1dG92QHlhbmRleC5ydT4KIAogCSogYXV0b21hdGVkL3J1Ynkt bW9kZS10ZXN0cy5lbCAocnVieS1zaG91bGQtaW5kZW50KQpkaWZmIC0tZ2l0IGEvdGVzdC9h dXRvbWF0ZWQvcnVieS1tb2RlLXRlc3RzLmVsIGIvdGVzdC9hdXRvbWF0ZWQvcnVieS1tb2Rl LXRlc3RzLmVsCmluZGV4IGZiZTFiOGQuLmY5MWI2ZTQgMTAwNjQ0Ci0tLSBhL3Rlc3QvYXV0 b21hdGVkL3J1YnktbW9kZS10ZXN0cy5lbAorKysgYi90ZXN0L2F1dG9tYXRlZC9ydWJ5LW1v ZGUtdGVzdHMuZWwKQEAgLTI0LDExICsyNCwyNCBAQAogKHJlcXVpcmUgJ3J1YnktbW9kZSkK IAogKGRlZnVuIHJ1Ynktc2hvdWxkLWluZGVudCAoY29udGVudCBjb2x1bW4pCisgICJBc3Nl cnQgaW5kZW50YXRpb24gQ09MVU1OIG9uIHRoZSBsYXN0IGxpbmUgb2YgQ09OVEVOVC4iCiAg ICh3aXRoLXRlbXAtYnVmZmVyCiAgICAgKGluc2VydCBjb250ZW50KQogICAgIChydWJ5LW1v ZGUpCiAgICAgKHJ1YnktaW5kZW50LWxpbmUpCi0gICAgKHNob3VsZCAoPSAoY3VycmVudC1j b2x1bW4pIGNvbHVtbikpKSkKKyAgICAoc2hvdWxkICg9IChjdXJyZW50LWluZGVudGF0aW9u KSBjb2x1bW4pKSkpCisKKyhkZWZ1biBydWJ5LXNob3VsZC1pbmRlbnQtYnVmZmVyIChleHBl Y3RlZCBjb250ZW50KQorICAiQXNzZXJ0IHRoYXQgQ09OVEVOVCB0dXJucyBpbnRvIEVYUEVD VEVEIGFmdGVyIHRoZSBidWZmZXIgaXMgcmUtaW5kZW50ZWQuCisKK1RoZSB3aGl0ZXNwYWNl IGJlZm9yZSBhbmQgaW5jbHVkaW5nIFwifFwiIG9uIGVhY2ggbGluZSBpcyByZW1vdmVkLiIK KyAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAoY2wtZmxldCAoKGZpeC1pbmRlbnQgKHMpIChy ZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcgIl5bIFx0XSp8IiAiIiBzKSkpCisgICAgICAoaW5z ZXJ0IChmaXgtaW5kZW50IGNvbnRlbnQpKQorICAgICAgKHJ1YnktbW9kZSkKKyAgICAgIChp bmRlbnQtcmVnaW9uIChwb2ludC1taW4pIChwb2ludC1tYXgpKQorICAgICAgKHNob3VsZCAo c3RyaW5nPSAoZml4LWluZGVudCBleHBlY3RlZCkgKGJ1ZmZlci1zdWJzdHJpbmctbm8tcHJv cGVydGllcworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChwb2ludC1taW4pIChwb2ludC1tYXgpKSkpKSkpCiAKIChkZWZ1biBydWJ5LWFzc2VydC1z dGF0ZSAoY29udGVudCAmcmVzdCB2YWx1ZXMtcGxpc3QpCiAgICJBc3NlcnQgc3ludGF4IHN0 YXRlIHZhbHVlcyBhdCB0aGUgZW5kIG9mIENPTlRFTlQuCkBAIC01Nyw2ICs3MCwxMjcgQEAg VkFMVUVTLVBMSVNUIGlzIGEgbGlzdCB3aXRoIGFsdGVybmF0aW5nIGluZGV4IGFuZCB2YWx1 ZSBlbGVtZW50cy4iCiAgIChydWJ5LWFzc2VydC1zdGF0ZSAiZm9vIDw8YXNkXG4iIDMgP1xu KQogICAocnVieS1hc3NlcnQtc3RhdGUgImNsYXNzIDw8YXNkXG4iIDMgbmlsKSkKIAorKGVy dC1kZWZ0ZXN0IHJ1YnktZGVlcC1pbmRlbnQgKCkKKyAgKGxldCAoKHJ1YnktZGVlcC1hcmds aXN0IG5pbCkKKyAgICAgICAgKHJ1YnktZGVlcC1pbmRlbnQtcGFyZW4gJyg/XCggP1x7ID9c WyA/XF0gdCkpKQorICAgIChydWJ5LXNob3VsZC1pbmRlbnQgImZvbyA9IFsxLFxuMiIgNykK KyAgICAocnVieS1zaG91bGQtaW5kZW50ICJmb28gPSB7YTogYixcbmM6IGQiIDcpCisgICAg KHJ1Ynktc2hvdWxkLWluZGVudCAiZm9vKGEsXG5iIiA0KSkpCisKKyhlcnQtZGVmdGVzdCBy dWJ5LWRlZXAtaW5kZW50LWRpc2FibGVkICgpCisgIChsZXQgKChydWJ5LWRlZXAtYXJnbGlz dCBuaWwpCisgICAgICAgIChydWJ5LWRlZXAtaW5kZW50LXBhcmVuIG5pbCkpCisgICAgKHJ1 Ynktc2hvdWxkLWluZGVudCAiZm9vID0gW1xuMSIgcnVieS1pbmRlbnQtbGV2ZWwpCisgICAg KHJ1Ynktc2hvdWxkLWluZGVudCAiZm9vID0ge1xuYTogYiIgcnVieS1pbmRlbnQtbGV2ZWwp CisgICAgKHJ1Ynktc2hvdWxkLWluZGVudCAiZm9vKFxuYSIgcnVieS1pbmRlbnQtbGV2ZWwp KSkKKworKGVydC1kZWZ0ZXN0IHJ1YnktaW5kZW50LXNpbXBsZSAoKQorICAocnVieS1zaG91 bGQtaW5kZW50LWJ1ZmZlcgorICAgImlmIGZvbworICAgfCAgYmFyCisgICB8ZW5kCisgICB8 em90CisgICB8IgorICAgImlmIGZvbworICAgfGJhcgorICAgfCAgZW5kCisgICB8ICAgIHpv dAorICAgfCIpKQorCisoZXJ0LWRlZnRlc3QgcnVieS1pbmRlbnQta2V5d29yZC1sYWJlbCAo KQorICAocnVieS1zaG91bGQtaW5kZW50LWJ1ZmZlcgorICAgImJhcihjbGFzczogWFhYKSBk bworICAgfCAgZm9vCisgICB8ZW5kCisgICB8YmFyCisgICB8IgorICAgImJhcihjbGFzczog WFhYKSBkbworICAgfCAgICAgZm9vCisgICB8ICBlbmQKKyAgIHwgICAgYmFyCisgICB8Iikp CisKKyhlcnQtZGVmdGVzdCBydWJ5LWluZGVudC1tZXRob2Qtd2l0aC1xdWVzdGlvbi1tYXJr ICgpCisgIChydWJ5LXNob3VsZC1pbmRlbnQtYnVmZmVyCisgICAiaWYgeC5pc19hPyhYWFgp CisgICB8ICBmb28KKyAgIHxlbmQKKyAgIHwiCisgICAiaWYgeC5pc19hPyhYWFgpCisgICB8 IGZvbworICAgfCAgIGVuZAorICAgfCIpKQorCisoZXJ0LWRlZnRlc3QgcnVieS1pbmRlbnQt ZXhwci1pbi1yZWdleHAgKCkKKyAgKHJ1Ynktc2hvdWxkLWluZGVudC1idWZmZXIKKyAgICJp ZiAvI3tmb299LyA9fiBzCisgICB8ICB4ID0gMQorICAgfGVuZAorICAgfCIKKyAgICJpZiAv I3tmb299LyA9fiBzCisgICB8IHggPSAxCisgICB8ICBlbmQKKyAgIHwiKSkKKworKGVydC1k ZWZ0ZXN0IHJ1YnktaW5kZW50LXNpbmdsZXRvbi1jbGFzcyAoKQorICA6ZXhwZWN0ZWQtcmVz dWx0IDpmYWlsZWQgICA7IERvZXNuJ3Qgd29yayB5ZXQsIHdoZW4gbm8gc3BhY2UgYmVmb3Jl ICI8PCIuCisgIChydWJ5LXNob3VsZC1pbmRlbnQtYnVmZmVyCisgICAiY2xhc3M8PGJhcgor ICAgfCAgZm9vCisgICB8ZW5kCisgICB8IgorICAgImNsYXNzPDxiYXIKKyAgIHxmb28KKyAg IHwgICBlbmQKKyAgIHwiKSkKKworKGVydC1kZWZ0ZXN0IHJ1YnktaW5kZW50LWFycmF5LWxp dGVyYWwgKCkKKyAgKGxldCAoKHJ1YnktZGVlcC1pbmRlbnQtcGFyZW4gbmlsKSkKKyAgICAo cnVieS1zaG91bGQtaW5kZW50LWJ1ZmZlcgorICAgICAiZm9vID0gWworICAgICB8ICBiYXIK KyAgICAgfF0KKyAgICAgfCIKKyAgICAgImZvbyA9IFsKKyAgICAgfCBiYXIKKyAgICAgfCAg XQorICAgICB8IikpCisgIChydWJ5LXNob3VsZC1pbmRlbnQtYnVmZmVyCisgICAiZm9vIGRv CisgICB8ICBbYmFyXQorICAgfGVuZAorICAgfCIKKyAgICJmb28gZG8KKyAgIHxbYmFyXQor ICAgfCAgZW5kCisgICB8IikpCisKKyhlcnQtZGVmdGVzdCBydWJ5LWluZGVudC1iZWdpbi1l bmQgKCkKKyAgKHJ1Ynktc2hvdWxkLWluZGVudC1idWZmZXIKKyAgICJiZWdpbgorICAgfCAg YVtiXQorICAgfGVuZAorICAgfCIKKyAgICJiZWdpbgorICAgfCBhW2JdCisgICB8ICBlbmQK KyAgIHwiKSkKKworKGVydC1kZWZ0ZXN0IHJ1YnktaW5kZW50LWFycmF5LWFmdGVyLXBhcmVu LWFuZC1zcGFjZSAoKQorICAocnVieS1zaG91bGQtaW5kZW50LWJ1ZmZlcgorICAgImNsYXNz IEEKKyAgIHwgIGRlZiBmb28KKyAgIHwgICAgZm9vKCBbXSkKKyAgIHwgIGVuZAorICAgfGVu ZAorICAgfCIKKyAgICJjbGFzcyBBCisgICB8IGRlZiBmb28KKyAgIHxmb28oIFtdKQorICAg fGVuZAorICAgfCAgZW5kCisgICB8IikpCisKIChwcm92aWRlICdydWJ5LW1vZGUtdGVzdHMp CiAKIDs7OyBydWJ5LW1vZGUtdGVzdHMuZWwgZW5kcyBoZXJlCg== --------------010109080102090103020402--