From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wK4ZBI4RrV+XRgAA0tVLHw (envelope-from ) for ; Thu, 12 Nov 2020 10:42:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +MZ4O40RrV9RVQAAbx9fmQ (envelope-from ) for ; Thu, 12 Nov 2020 10:42:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4FFF59401BF for ; Thu, 12 Nov 2020 10:42:21 +0000 (UTC) Received: from localhost ([::1]:53420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdA3W-0002nD-R1 for larch@yhetil.org; Thu, 12 Nov 2020 05:42:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdA0I-0001cv-Sh for emacs-orgmode@gnu.org; Thu, 12 Nov 2020 05:39:04 -0500 Received: from mail-ej1-f53.google.com ([209.85.218.53]:46217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdA0H-0000e4-2O for emacs-orgmode@gnu.org; Thu, 12 Nov 2020 05:38:58 -0500 Received: by mail-ej1-f53.google.com with SMTP id w13so6944199eju.13 for ; Thu, 12 Nov 2020 02:38:56 -0800 (PST) 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; bh=VqBD3YWKL0V84IncI/0hR6MxUYWqiX1IwQ0AKRP8mSk=; b=o2g8OcY0uruCX8KS/1npFI8v2YK3ZmGOvtMYisNtI3nsk5ymunhtTSN5XveW/gb0wB Cpr0j4GRoLEDFxJwnzwjSYPNtfZ5oVFF+/mR0S6UpLBGBoeOD3vWYbl6tQzjraiZ65zI zWvIbAp/038qH2MoozXwKf14JJRtGORc6d/ghHYM52j16/zzRHDUCcGx57lVRvPSlwSs ClEcjTrstoZsL1UkzpSdRdhKFFTt/odmtFMnVmfErY3NlBrWwawOqUBGOX1h12aqLfQr vGspoxUAfwgkhvXMTEWrc/Tw+PRoZBRmv1BdX4jTPSx2SUYDn6UBdKwtdYebj1U5IASE xslQ== X-Gm-Message-State: AOAM533aXvt0skASE52YLTK1SeS8coauin8ogXtRHtTMJoGnXZ4rjn+q P9quJ5q7IEZxAa8ylC29cY4U7T5LM5Jnpb0MfLLxVkjmtMrvpg== X-Google-Smtp-Source: ABdhPJwPro3EDgRl/CFyA6XBol2ZpQAXW9keeKYrlmXSktUyHXBivWeoeO4Ma8nGa+f57m2Mj1jyfKNabrpRvOabxr4= X-Received: by 2002:a17:906:3daa:: with SMTP id y10mr29161562ejh.23.1605177534863; Thu, 12 Nov 2020 02:38:54 -0800 (PST) MIME-Version: 1.0 From: ian martins Date: Thu, 12 Nov 2020 05:38:43 -0500 Message-ID: Subject: [PATCH] ob-java.el: Allow for more whitespace To: Org-Mode mailing list Content-Type: multipart/mixed; boundary="000000000000c47fce05b3e6848c" Received-SPF: pass client-ip=209.85.218.53; envelope-from=ianxm1@gmail.com; helo=mail-ej1-f53.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 05:38:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=jhu.edu (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Spam-Score: 0.19 X-TUID: belEPI+a5h8O --000000000000c47fce05b3e6848c Content-Type: text/plain; charset="UTF-8" Two patches are attached. One allows for more whitespace in java code blocks. The other fixes a bug that would result in a main method being wrapped in another main method. --000000000000c47fce05b3e6848c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-ob-java.el-Do-not-wrap-a-main-method-in-a-main-metho.patch" Content-Disposition: attachment; filename="0001-ob-java.el-Do-not-wrap-a-main-method-in-a-main-metho.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_khep32xl0 RnJvbSA5ZmJiNWE0MzZlYmMwMDdkMTlhZGMyMGZjZWU3ZWJmMDhlNGFlYzNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJYW4gTWFydGlucyA8aWFueG1Aamh1LmVkdT4KRGF0ZTogVGh1 LCAxMiBOb3YgMjAyMCAwNTowOToxMSAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBvYi1qYXZh LmVsOiBEbyBub3Qgd3JhcCBhIG1haW4gbWV0aG9kIGluIGEgbWFpbiBtZXRob2QKCiogbGlzcC9v Yi1qYXZhLmVsIChvcmctYmFiZWwtZXhwYW5kLWJvZHk6amF2YSk6IFRoZSBjb2RlIHdhcyBjaGVj a2luZwpmb3IgZXhpc3RlbmNlIG9mIGEgY2xhc3MgZGVjbGFyYXRpb24gYmVmb3JlIHdyYXBwaW5n IHRoZSBjb250ZW50IG9mCnRoZSBjb2RlIGJsb2NrIGluIGEgbWFpbiBtZXRob2QsIGJ1dCBpdCBz aG91bGQgYmUgY2hlY2tpbmcgZm9yCmV4aXN0ZW5jZSBvZiBhIG1haW4gbWV0aG9kLgotLS0KIGxp c3Avb2ItamF2YS5lbCB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBk ZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb2ItamF2YS5lbCBiL2xpc3Avb2ItamF2YS5l bAppbmRleCBkOGQ0ZGI4NTIuLjkyZTg3M2YwZCAxMDA2NDQKLS0tIGEvbGlzcC9vYi1qYXZhLmVs CisrKyBiL2xpc3Avb2ItamF2YS5lbApAQCAtMjk2LDcgKzI5Niw3IEBAIGlzIHNpbXBsZXN0IHRv IGV4cGFuZCB0aGUgY29kZSBibG9jayBmcm9tIHRoZSBpbnNpZGUgb3V0LiIKICAgICAgIDs7IHdy YXAgbWFpbi4gIElmIHRoZXJlIGFyZSBtZXRob2RzIGRlZmluZWQsIGJ1dCBubyBtYWluIG1ldGhv ZAogICAgICAgOzsgYW5kIG5vIGNsYXNzLCB3cmFwIGV2ZXJ5dGhpbmcgaW4gYSBnZW5lcmljIG1h aW4gbWV0aG9kLgogICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKLSAgICAgICh3aGVuIChh bmQgKG5vdCAocmUtc2VhcmNoLWZvcndhcmQgb3JnLWJhYmVsLWphdmEtLWNsYXNzLXJlIG5pbCB0 KSkKKyAgICAgICh3aGVuIChhbmQgKG5vdCAocmUtc2VhcmNoLWZvcndhcmQgb3JnLWJhYmVsLWph dmEtLW1haW4tcmUgbmlsIHQpKQogICAgICAgICAgICAgICAgICAobm90IChyZS1zZWFyY2gtZm9y d2FyZCBvcmctYmFiZWwtamF2YS0tYW55LW1ldGhvZC1yZSBuaWwgdCkpKQogICAgICAgICAob3Jn LWJhYmVsLWphdmEtLW1vdmUtcGFzdCBvcmctYmFiZWwtamF2YS0tcGFja2FnZS1yZSkgOyBpZiBw YWNrYWdlIGlzIGRlZmluZWQsIG1vdmUgcGFzdCBpdAogICAgICAgICAob3JnLWJhYmVsLWphdmEt LW1vdmUtcGFzdCBvcmctYmFiZWwtamF2YS0taW1wb3J0cy1yZSkgOyBpZiBpbXBvcnRzIGFyZSBk ZWZpbmVkLCBtb3ZlIHBhc3QgdGhlbQotLSAKMi4yNS4xCgo= --000000000000c47fce05b3e6848c Content-Type: text/x-patch; charset="US-ASCII"; name="0002-ob-java.el-Allow-for-more-whitespace-in-java-code.patch" Content-Disposition: attachment; filename="0002-ob-java.el-Allow-for-more-whitespace-in-java-code.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_khep32y41 RnJvbSAxOWFmNDk1ZjQxNTJjZDdiODU4MGNlYWIyYTE2ODE4MmY0NGJlZGJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJYW4gTWFydGlucyA8aWFueG1Aamh1LmVkdT4KRGF0ZTogVGh1 LCAxMiBOb3YgMjAyMCAwNToxODo0OCAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBvYi1qYXZh LmVsOiBBbGxvdyBmb3IgbW9yZSB3aGl0ZXNwYWNlIGluIGphdmEgY29kZQoKKiBsaXNwL29iLWph dmEuZWwgKGRlZmNvbnN0ICotcmUpOiBVcGRhdGVkIHJlZ2V4cHMgdG8gYWxsb3cgZm9yIG1vcmUK d2hpdGVzcGFjZSBpbiB0aGUgY29udGVudCBvZiBqYXZhIGNvZGUgYmxvY2tzLCBhbmQgcmVtb3Zl ZCBzb21lCnJlZHVuZGFuY2llcy4KCiogdGVzdGluZy9saXNwL3Rlc3Qtb2ItamF2YS5lbCAob2It amF2YS9zaW1wbGUtd2l0aC1tYWluLXdoaXRlc3BhY2UpOgpBZGRlZCB0ZXN0IGNhc2Ugd2l0aCBs b3RzIG9mIHdoaXRlc3BhY2UuCi0tLQogbGlzcC9vYi1qYXZhLmVsICAgICAgICAgICAgICB8IDEw ICsrKysrLS0tLS0KIHRlc3RpbmcvbGlzcC90ZXN0LW9iLWphdmEuZWwgfCAxOCArKysrKysrKysr KysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9saXNwL29iLWphdmEuZWwgYi9saXNwL29iLWphdmEuZWwKaW5kZXgg OTJlODczZjBkLi5kNjUxNzZkNGUgMTAwNjQ0Ci0tLSBhL2xpc3Avb2ItamF2YS5lbAorKysgYi9s aXNwL29iLWphdmEuZWwKQEAgLTc3LDE1ICs3NywxNSBAQCBsaWtlIGphdmFjIC12ZXJib3NlLiIK ICAgOnBhY2thZ2UtdmVyc2lvbiAnKE9yZyAuICI5LjUiKQogICA6dHlwZSAnc3ltYm9sKQogCi0o ZGVmY29uc3Qgb3JnLWJhYmVsLWphdmEtLXBhY2thZ2UtcmUgIl5bWzpzcGFjZTpdXSpwYWNrYWdl W1s6c3BhY2U6XV0rXFxcKFtbOmFsbnVtOl1fXC5dK1xcXCk7JCIKKyhkZWZjb25zdCBvcmctYmFi ZWwtamF2YS0tcGFja2FnZS1yZSAiXltbOnNwYWNlOl1dKnBhY2thZ2VbWzpzcGFjZTpdXStcXFwo W1s6YWxudW06XV9cLl0rXFxcKVtbOnNwYWNlOl1dKjskIgogICAiUmVnZXhwIGZvciB0aGUgcGFj a2FnZSBzdGF0ZW1lbnQuIikKLShkZWZjb25zdCBvcmctYmFiZWwtamF2YS0taW1wb3J0cy1yZSAi XltbOnNwYWNlOl1dKmltcG9ydFtbOnNwYWNlOl1dK1xcXChbWzphbG51bTpdX1wuXStcXFwpOyQi CisoZGVmY29uc3Qgb3JnLWJhYmVsLWphdmEtLWltcG9ydHMtcmUgIl5bWzpzcGFjZTpdXSppbXBv cnRbWzpzcGFjZTpdXStcXFwoW1s6YWxudW06XV9cLl0rXFxcKVtbOnNwYWNlOl1dKjskIgogICAi UmVnZXhwIGZvciBpbXBvcnQgc3RhdGVtZW50cy4iKQotKGRlZmNvbnN0IG9yZy1iYWJlbC1qYXZh LS1jbGFzcy1yZSAiXltbOnNwYWNlOl1dKlxcXCg/OnB1YmxpY1tbOnNwYWNlOl1dK1xcXCk/Y2xh c3NbWzpzcGFjZTpdXStcXFwoW1s6YWxudW06XV9dK1xcXClbWzpzcGFjZTpdXSpcbj9bWzpzcGFj ZTpdXSp7IgorKGRlZmNvbnN0IG9yZy1iYWJlbC1qYXZhLS1jbGFzcy1yZSAiXltbOnNwYWNlOl1d KlxcXCg/OnB1YmxpY1tbOnNwYWNlOl1dK1xcXCk/Y2xhc3NbWzpzcGFjZTpdXStcXFwoW1s6YWxu dW06XV9dK1xcXClbWzpzcGFjZTpdXSp7IgogICAiUmVnZXhwIGZvciB0aGUgY2xhc3MgZGVjbGFy YXRpb24uIikKLShkZWZjb25zdCBvcmctYmFiZWwtamF2YS0tbWFpbi1yZSAicHVibGljIHN0YXRp YyB2b2lkIG1haW4oU3RyaW5nXFxcKD86XFxbXVxcXCk/W1s6c3BhY2U6XV0rW14gXStcXFwoPzpc XFtdXFxcKT8pLipcbj9bWzpzcGFjZTpdXSp7IgorKGRlZmNvbnN0IG9yZy1iYWJlbC1qYXZhLS1t YWluLXJlICJwdWJsaWNbWzpzcGFjZTpdXStzdGF0aWNbWzpzcGFjZTpdXSt2b2lkW1s6c3BhY2U6 XV0rbWFpbltbOnNwYWNlOl1dKihbWzpzcGFjZTpdXSpTdHJpbmdbWzpzcGFjZTpdXSouKltbOnNw YWNlOl1dKilbWzpzcGFjZTpdXSouKltbOnNwYWNlOl1dKnsiCiAgICJSZWdleHAgZm9yIHRoZSBt YWluIG1ldGhvZCBkZWNsYXJhdGlvbi4iKQotKGRlZmNvbnN0IG9yZy1iYWJlbC1qYXZhLS1hbnkt bWV0aG9kLXJlICJwdWJsaWMgLiooLiopLipcbj9bWzpzcGFjZTpdXSp7IgorKGRlZmNvbnN0IG9y Zy1iYWJlbC1qYXZhLS1hbnktbWV0aG9kLXJlICJwdWJsaWNbWzpzcGFjZTpdXSsuKltbOnNwYWNl Ol1dKihbWzpzcGFjZTpdXSouKltbOnNwYWNlOl1dKilbWzpzcGFjZTpdXSouKltbOnNwYWNlOl1d KnsiCiAgICJSZWdleHAgZm9yIGFueSBtZXRob2QuIikKIChkZWZjb25zdCBvcmctYmFiZWwtamF2 YS0tcmVzdWx0LXdyYXBwZXIgIlxuICAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIF9fdG9TdHJpbmco T2JqZWN0IHZhbCkgewogICAgICAgICBpZiAodmFsIGluc3RhbmNlb2YgU3RyaW5nKSB7CmRpZmYg LS1naXQgYS90ZXN0aW5nL2xpc3AvdGVzdC1vYi1qYXZhLmVsIGIvdGVzdGluZy9saXNwL3Rlc3Qt b2ItamF2YS5lbAppbmRleCBlMTQ5NzU0MTIuLjUwZDNlZjViMCAxMDA2NDQKLS0tIGEvdGVzdGlu Zy9saXNwL3Rlc3Qtb2ItamF2YS5lbAorKysgYi90ZXN0aW5nL2xpc3AvdGVzdC1vYi1qYXZhLmVs CkBAIC0xMjgsNiArMTI4LDI0IEBAIHB1YmxpYyBzdGF0aWMgdm9pZCBtYWluKFN0cmluZyBhcmdz W10pIHsKICMrZW5kX3NyYyIKICAgICAoc2hvdWxkIChzdHJpbmc9ICI0MiIgKG9yZy1iYWJlbC1l eGVjdXRlLXNyYy1ibG9jaykpKSkpCiAKKyhlcnQtZGVmdGVzdCBvYi1qYXZhL3NpbXBsZS13aXRo LW1haW4td2hpdGVzcGFjZSAoKQorICAiSGVsbG8gd29ybGQgcHJvZ3JhbSB0aGF0IGRlZmluZXMg YSBtYWluIGZ1bmN0aW9uIHdpdGggdGhlIHNxdWFyZSBicmFja2V0cyBhZnRlciBgYXJncycuIgor ICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQKKyAgICAgICIjK2JlZ2luX3NyYyBqYXZhIDpyZXN1 bHRzIG91dHB1dCBzaWxlbnQKK3B1YmxpYworc3RhdGljCit2b2lkCittYWluCisgKAorIFN0cmlu ZworIGFyZ3MgW10KKyApCit7CisgICAgU3lzdGVtLm91dC5wcmludCg0Mik7Cit9CisjK2VuZF9z cmMiCisgICAgKHNob3VsZCAoc3RyaW5nPSAiNDIiIChvcmctYmFiZWwtZXhlY3V0ZS1zcmMtYmxv Y2spKSkpKQorCiAoZXJ0LWRlZnRlc3Qgb2ItamF2YS9zaW1wbGUtd2l0aC1jbGFzcyAoKQogICAi SGVsbG8gd29ybGQgcHJvZ3JhbSB0aGF0IGRlZmluZXMgYSBjbGFzcy4iCiAgIChvcmctdGVzdC13 aXRoLXRlbXAtdGV4dAotLSAKMi4yNS4xCgo= --000000000000c47fce05b3e6848c--