From mboxrd@z Thu Jan 1 00:00:00 1970 From: "R. Michael Weylandt" Subject: Re: Prepare release 8.2.6 Date: Sun, 13 Apr 2014 13:02:46 -0400 Message-ID: References: <87ha6adikd.fsf@bzg.ath.cx> <4C681CE3-580A-4C68-A745-FD0CCF115E0C@gmail.com> <87txa760h6.fsf@gmail.com> <87wqewy4aq.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=089e0158ab5c6fedd104f6ef8a3f Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZNoE-0007dr-IY for emacs-orgmode@gnu.org; Sun, 13 Apr 2014 13:03:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WZNoD-0003Ci-Rl for emacs-orgmode@gnu.org; Sun, 13 Apr 2014 13:03:10 -0400 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]:54782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZNoD-0003BO-K4 for emacs-orgmode@gnu.org; Sun, 13 Apr 2014 13:03:09 -0400 Received: by mail-la0-f46.google.com with SMTP id hr17so4950423lab.19 for ; Sun, 13 Apr 2014 10:03:07 -0700 (PDT) In-Reply-To: <87wqewy4aq.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Eric Schulte Cc: "emacs-orgmode@gnu.org" --089e0158ab5c6fedd104f6ef8a3f Content-Type: text/plain; charset=ISO-8859-1 On Thu, Apr 10, 2014 at 10:43 PM, Eric Schulte wrote: > > I just tried to apply the second patch, but it no longer applies (with > "git am") to the Org-mode repo. Would you mind sending along an updated > version? > Hi Eric, The attached should apply cleanly against master. Michael --089e0158ab5c6fedd104f6ef8a3f Content-Type: application/octet-stream; name="0001-Keybinding-to-remove-result-blocks.patch" Content-Disposition: attachment; filename="0001-Keybinding-to-remove-result-blocks.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_htykyshw0 RnJvbSBkN2QzNDI4ZDVkM2ZmNTBiOGFiYWI3YWQzMjY0M2ZkMjFiNjkzODg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFdleWxhbmR0IDxtaWNoYWVsLndleWxhbmR0QGdt YWlsLmNvbT4KRGF0ZTogU3VuLCAxMyBBcHIgMjAxNCAxMjo1ODozMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIEtleWJpbmRpbmcgdG8gcmVtb3ZlIHJlc3VsdCBibG9ja3MKCiogb2ItY29yZS5lbCAo b3JnLWJhYmVsLXJlbW92ZS1yZXN1bHQtb25lLW9yLW1hbnkpOiBOZXcgZnVuY3Rpb24uCiogb2It a2V5cy5lbDogS2V5YmluZGluZyBmb3IgbmV3IGZ1bmN0aW9uIG9yZy1iYWJlbC1yZW1vdmUtcmVz dWx0LW9uZS1vci1tYW55CgpUSU5ZQ0hBTkdFCi0tLQogbGlzcC9vYi1jb3JlLmVsIHwgOSArKysr KysrKysKIGxpc3Avb2Ita2V5cy5lbCB8IDEgKwogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRp b25zKCspCgpkaWZmIC0tZ2l0IGEvbGlzcC9vYi1jb3JlLmVsIGIvbGlzcC9vYi1jb3JlLmVsCmlu ZGV4IDBhZGZjMzMuLjBlOGM1N2YgMTAwNjQ0Ci0tLSBhL2xpc3Avb2ItY29yZS5lbAorKysgYi9s aXNwL29iLWNvcmUuZWwKQEAgLTIyNTIsNiArMjI1MiwxNSBAQCBjb2RlIC0tLS0gdGhlIHJlc3Vs dHMgYXJlIGV4dHJhY3RlZCBpbiB0aGUgc3ludGF4IG9mIHRoZSBzb3VyY2UKIAkgICAoaWYga2Vl cC1rZXl3b3JkICgxKyAobWF0Y2gtZW5kIDApKSAoMS0gKG1hdGNoLWJlZ2lubmluZyAwKSkpCiAJ ICAgKHByb2duIChmb3J3YXJkLWxpbmUgMSkgKG9yZy1iYWJlbC1yZXN1bHQtZW5kKSkpKSkpKSkK IAorKGRlZnVuIG9yZy1iYWJlbC1yZW1vdmUtcmVzdWx0LW9uZS1vci1tYW55ICh4KQorICAiUmVt b3ZlIHRoZSByZXN1bHQgb2YgdGhlIGN1cnJlbnQgc291cmNlIGJsb2NrLgorSWYgY2FsbGVkIHdp dGggYSBwcmVmaXggYXJndW1lbnQsIHJlbW92ZSBhbGwgcmVzdWx0IGJsb2NrcworaW4gdGhlIGJ1 ZmZlci4iCisgIChpbnRlcmFjdGl2ZSAiUCIpCisgIChpZiB4CisgICAgICAob3JnLWJhYmVsLW1h cC1zcmMtYmxvY2tzIG5pbCAob3JnLWJhYmVsLXJlbW92ZS1yZXN1bHQpKQorICAgIChvcmctYmFi ZWwtcmVtb3ZlLXJlc3VsdCkpKQorCiAoZGVmdW4gb3JnLWJhYmVsLXJlc3VsdC1lbmQgKCkKICAg IlJldHVybiB0aGUgcG9pbnQgYXQgdGhlIGVuZCBvZiB0aGUgY3VycmVudCBzZXQgb2YgcmVzdWx0 cy4iCiAgIChzYXZlLWV4Y3Vyc2lvbgpkaWZmIC0tZ2l0IGEvbGlzcC9vYi1rZXlzLmVsIGIvbGlz cC9vYi1rZXlzLmVsCmluZGV4IDkwYjUxOTYuLmRjMWY0MzcgMTAwNjQ0Ci0tLSBhL2xpc3Avb2It a2V5cy5lbAorKysgYi9saXNwL29iLWtleXMuZWwKQEAgLTg5LDYgKzg5LDcgQEAgZnVuY3Rpb25z IHdoaWNoIGFyZSBhc3NpZ25lZCBrZXkgYmluZGluZ3MsIGFuZCBzZWUKICAgICAoImgiIC4gb3Jn LWJhYmVsLWRlc2NyaWJlLWJpbmRpbmdzKQogICAgICgiXEMteCIgLiBvcmctYmFiZWwtZG8ta2V5 LXNlcXVlbmNlLWluLWVkaXQtYnVmZmVyKQogICAgICgieCIgLiBvcmctYmFiZWwtZG8ta2V5LXNl cXVlbmNlLWluLWVkaXQtYnVmZmVyKQorICAgICgiayIgLiBvcmctYmFiZWwtcmVtb3ZlLXJlc3Vs dC1vbmUtb3ItbWFueSkKICAgICAoIlxDLVxNLWgiIC4gb3JnLWJhYmVsLW1hcmstYmxvY2spKQog ICAiQWxpc3Qgb2Yga2V5IGJpbmRpbmdzIGFuZCBpbnRlcmFjdGl2ZSBCYWJlbCBmdW5jdGlvbnMu CiBUaGlzIGxpc3QgYXNzb2NpYXRlcyBpbnRlcmFjdGl2ZSBCYWJlbCBmdW5jdGlvbnMKLS0gCjEu OC4zLjQgKEFwcGxlIEdpdC00NykKCg== --089e0158ab5c6fedd104f6ef8a3f--