From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: [PATCH] Fix the single quote printed in the message printed by org-table-edit-formulas Date: Fri, 11 Mar 2016 12:44:48 -0500 Message-ID: References: <87oaamuw2q.fsf@kyleam.com> <56E221EA.4080106@cs.ucla.edu> <87egbhab5x.fsf@kyleam.com> <8737rxa97v.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=089e0115fa5c1d47a3052dc97fc7 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeR7y-0005HG-JX for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 12:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeR7x-00010L-A8 for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 12:45:30 -0500 Received: from mail-ob0-x235.google.com ([2607:f8b0:4003:c01::235]:35800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeR7x-00010D-1g for emacs-orgmode@gnu.org; Fri, 11 Mar 2016 12:45:29 -0500 Received: by mail-ob0-x235.google.com with SMTP id fp4so120304845obb.2 for ; Fri, 11 Mar 2016 09:45:28 -0800 (PST) In-Reply-To: <8737rxa97v.fsf@kyleam.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: Kyle Meyer Cc: Paul Eggert , emacs-org list --089e0115fa5c1d47a3052dc97fc7 Content-Type: multipart/alternative; boundary=089e0115fa5c1d479e052dc97fc5 --089e0115fa5c1d479e052dc97fc5 Content-Type: text/plain; charset=UTF-8 Patch (after rebasing to 5a735b0) attached. I hope it works. Git newbie question: Making the changes in the maint version of these 4 files manually was a bit of a pain. What's the right way of porting changes from one branch to another? I am curious how the changes will be ported from the maint branch to the master branch. What git command should I be looking at to do this in future? (because I always use the master branch and if I need to submit a patch in future, I would need to switch to maint branch and port changes from my master. Thanks. -- Kaushal Modi On Fri, Mar 11, 2016 at 12:12 AM, Kyle Meyer wrote: > Kaushal Modi writes: > > > About the patch not merging, I am surprised why that happened because I > > first rebased to > > > http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=e69e18dd71bdf0c9bae9546bf026a1123b9a8c53 > > and then created the patch. I redo the steps using git send-email > tomorrow > > and understand the difference. > > Please make the patch against the maint branch (currently 5a735b0b8) > rather than master. Also, you don't need to bother configuring git > send-email; an attachment with the output of git format-patch is OK too. > > > About the org-contribute page, it is pointing to a different version of > > emacs CONTRIBUTE, different from the one on emacs-25 branch ( > > http://git.savannah.gnu.org/cgit/emacs.git/tree/CONTRIBUTE ). Can you > > please review that? > > Thanks for pointing that out. I'll update the link. > > -- > Kyle > --089e0115fa5c1d479e052dc97fc5 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Patch (after rebasing to 5a735b0) attached. I hope it work= s.

Git newbie question:

Making = the changes in the maint version of these 4 files manually was a bit of a p= ain. What's the right way of porting changes from one branch to another= ? I am curious how the changes will be ported from the maint branch to the = master branch. What git command should I be looking at to do this in future= ? (because I always use the master branch and if I need to submit a patch i= n future, I would need to switch to maint branch and port changes from my m= aster.

Thanks.

=
--
Kaushal Modi

On Fri, Mar 11, 2016 at 12:12 AM, Kyle Meyer= <kyle@kyleam.com> wrote:
Kaushal Modi <k= aushal.modi@gmail.com> writes:

> About the patch not merging, I am surprised why that happened because = I
> first rebased to
> h= ttp://orgmode.org/cgit.cgi/org-mode.git/commit/?id=3De69e18dd71bdf0c9bae954= 6bf026a1123b9a8c53
> and then created the patch. I redo the steps using git send-email tomo= rrow
> and understand the difference.

Please make the patch against the maint branch (currently 5a735b0b8)=
rather than master.=C2=A0 Also, you don't need to bother configuring gi= t
send-email; an attachment with the output of git format-patch is OK too.
> About the org-contribute page, it is pointing to a different version o= f
> emacs CONTRIBUTE, different from the one on emacs-25 branch (
> http://git.savannah.gnu.org/cgit/emac= s.git/tree/CONTRIBUTE ). Can you
> please review that?

Thanks for pointing that out.=C2=A0 I'll update the link.

--
Kyle

--089e0115fa5c1d479e052dc97fc5-- --089e0115fa5c1d47a3052dc97fc7 Content-Type: application/octet-stream; name="0001-Display-quotes-in-key-bindings-as-straight-quotes.patch" Content-Disposition: attachment; filename="0001-Display-quotes-in-key-bindings-as-straight-quotes.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ilnzoyy30 RnJvbSBmYjdmYmIyYmNhN2U3NDQ4ZjI1YWUwMTRhNTA2MzExMDI0MDk1YWFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLYXVzaGFsIE1vZGkgPGthdXNoYWwubW9kaUBnbWFpbC5jb20+ CkRhdGU6IEZyaSwgMTEgTWFyIDIwMTYgMTI6MzA6MjAgLTA1MDAKU3ViamVjdDogW1BBVENIXSBE aXNwbGF5IHF1b3RlcyBpbiBrZXktYmluZGluZ3MgYXMgc3RyYWlnaHQgcXVvdGVzCgoqIGxpc3Av b3JnLWFnZW5kYS5lbCAob3JnLWFnZW5kYS1zaG93LXRoZS1mbGFnZ2luZy1ub3RlKToKKiBsaXNw L29yZy1mb290bm90ZS5lbCAob3JnLWZvb3Rub3RlLWdvdG8tZGVmaW5pdGlvbik6CiogbGlzcC9v cmctdGFibGUuZWwgKG9yZy10YWJsZS1lZGl0LWZvcm11bGFzKTogRml4IHN0cmFpZ2h0IHF1b3Rl cwogIHJlbmRlcmVkIGFzIGN1cnZ5IHF1b3RlcyBpbiBlY2hvZXMgbWVzc2FnZXMgKGluIGVtYWNz IDI1LjEpLgoqIGxpc3Avb3JnLXRhYmxlLmVsIChvcmctdGFibGUtYWxpZ24pOiBGaXggc3RyYWln aHQgcXVvdGVzIHJlbmRlcmVkIGFzCiAgY3VydnkgcXVvdGVzIGluIGhlbHAgZWNobyAoaW4gZW1h Y3MgMjUuMSkuCgoqIGxpc3Avb3JnLXByb3RvY29sLmVsIChvcmctcHJvdG9jb2wtY3JlYXRlLWZv ci1vcmcpOgoqIGxpc3Avb3JnLXRhYmxlLmVsIChvcmctdGFibGUtc3VtKTogTWlub3IgcmVmb3Jt YXR0aW5nLgoKVGhlIGJlbG93IHRocmVhZCBkaXNjdXNzZXMgd2h5IHRoZXNlIGNoYW5nZXMgd2Vy ZSBuZWVkZWQgZXNwZWNpYWxseSB3aGVuCnVzaW5nIGVtYWNzIDI1LjEgb3IgbmV3ZXIgZW1hY3Nl biAodGhhdCBhZGRlZCBzdXBwb3J0IGZvciByZW5kZXJpbmcKYmFjay1xdW90ZXMgYW5kIHN0cmFp Z2h0IHF1b3RlcyBhcyBsZWZ0L3JpZ2h0IGN1cnZ5IHF1b3RlcyBieSBkZWZhdWx0KToKaHR0cDov L3RocmVhZC5nbWFuZS5vcmcvZ21hbmUuZW1hY3Mub3JnbW9kZS8xMDU1OTQKCkZpeCB0aGUgcXVv dGUgc3R5bGUgZGlzcGxheWVkIHdoZW4ga2V5LWJpbmRpbmdzIGFyZSBzaG93biBpbgp0aGUgZWNo byB2aWEgKG1lc3NhZ2UgLi4gKHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzIC4uKSkuCgpTbyBiZWxv dyB3aWxsIHJlbmRlciB0aGF0IHNpbmdsZSBxdW90ZSBhcyBjdXJseS4KCihtZXNzYWdlICJDLWMg JyIpCgpUaGUgZml4IChSZWZlcmVuY2U6Cmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0 bWwvYnVnLWdudS1lbWFjcy8yMDE1LTEwL21zZzAwMjM0Lmh0bWwpCmlzIHRvIHByaW50IHRoYXQg cXVvdGUgdmVyYmF0aW0gdXNpbmcgdGhlICIlcyIgbW9kaWZpZXI6CgoobWVzc2FnZSAiJXMiICJD LWMgJyIpCgpBbHNvIGFuIGhlbHAtZWNobyB0ZXh0IHByb3BlcnR5IHZhbHVlIHdhcyBmaXhlZCBp biBgb3JnLXRhYmxlLWFsaWduJy4KYHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzJyBzaG91bGQgbm90 IGJlIHVzZWQgaW4gdGhhdC4gIEluc3RlYWQgXFxbQ09NTUFORF0Kc2hvdWxkIGJlIHVzZWQgZGly ZWN0bHkgaW4gdGhlIHN0cmluZy4KLS0tCiBsaXNwL29yZy1hZ2VuZGEuZWwgICB8ICA1ICsrKy0t CiBsaXNwL29yZy1mb290bm90ZS5lbCB8ICA3ICsrKy0tLS0KIGxpc3Avb3JnLXByb3RvY29sLmVs IHwgIDIgKy0KIGxpc3Avb3JnLXRhYmxlLmVsICAgIHwgMTcgKysrKysrKy0tLS0tLS0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9vcmctYWdlbmRhLmVsIGIvbGlzcC9vcmctYWdlbmRhLmVsCmluZGV4IDE5YTQw OTUuLmJmN2ZjMzQgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLWFnZW5kYS5lbAorKysgYi9saXNwL29y Zy1hZ2VuZGEuZWwKQEAgLTEwMDgzLDggKzEwMDgzLDkgQEAgdGFnIGFuZCAoaWYgcHJlc2VudCkg dGhlIGZsYWdnaW5nIG5vdGUuIgogCShyZXBsYWNlLW1hdGNoICJcbiIgdCB0KSkKICAgICAgIChn b3RvLWNoYXIgKHBvaW50LW1pbikpCiAgICAgICAoc2VsZWN0LXdpbmRvdyB3aW4pCi0gICAgICAo bWVzc2FnZSAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMgIkZsYWdnaW5nIG5vdGUgcHVzaGVkIHRv IGtpbGwgcmluZy4gIFwKLVByZXNzIFxcW29yZy1hZ2VuZGEtc2hvdy10aGUtZmxhZ2dpbmctbm90 ZV0gYWdhaW4gdG8gcmVtb3ZlIHRhZyBhbmQgbm90ZSIpKSkpKQorICAgICAgKG1lc3NhZ2UgIiVz IiAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMgIkZsYWdnaW5nIG5vdGUgcHVzaGVkIHRvIFwKK2tp bGwgcmluZy4gIFByZXNzIFxcW29yZy1hZ2VuZGEtc2hvdy10aGUtZmxhZ2dpbmctbm90ZV0gYWdh aW4gdG8gcmVtb3ZlIFwKK3RhZyBhbmQgbm90ZSIpKSkpKQogCiAoZGVmdW4gb3JnLWFnZW5kYS1y ZW1vdmUtZmxhZyAobWFya2VyKQogICAiUmVtb3ZlIHRoZSBGTEFHR0VEIHRhZyBhbmQgYW55IGZs YWdnaW5nIG5vdGUgaW4gdGhlIGVudHJ5LiIKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLWZvb3Rub3Rl LmVsIGIvbGlzcC9vcmctZm9vdG5vdGUuZWwKaW5kZXggODAwYjVkZi4uYjgzYTdmNyAxMDA2NDQK LS0tIGEvbGlzcC9vcmctZm9vdG5vdGUuZWwKKysrIGIvbGlzcC9vcmctZm9vdG5vdGUuZWwKQEAg LTM5MSwxMCArMzkxLDkgQEAgdmFsdWUgaWYgcG9pbnQgd2FzIHN1Y2Nlc3NmdWxseSBtb3ZlZC4i CiAgICAgKGdvdG8tY2hhciAobWF0Y2gtZW5kIDApKQogICAgIChvcmctc2hvdy1jb250ZXh0ICds aW5rLXNlYXJjaCkKICAgICAod2hlbiAoZGVyaXZlZC1tb2RlLXAgJ29yZy1tb2RlKQotICAgICAg KG1lc3NhZ2UKLSAgICAgICAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMKLQkiRWRpdCBkZWZpbml0 aW9uIGFuZCBnbyBiYWNrIHdpdGggYFxcW29yZy1tYXJrLXJpbmctZ290b10nIG9yLCBpZiBcCi11 bmlxdWUsIHdpdGggYFxcW29yZy1jdHJsLWMtY3RybC1jXScuIikpKQorICAgICAgKG1lc3NhZ2Ug IiVzIiAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMKKwkJICAgICAiRWRpdCBkZWZpbml0aW9uIGFu ZCBnbyBiYWNrIHdpdGggXAorYFxcW29yZy1tYXJrLXJpbmctZ290b10nIG9yLCBpZiB1bmlxdWUs IHdpdGggYFxcW29yZy1jdHJsLWMtY3RybC1jXScuIikpKQogICAgIHQpKQogCiAoZGVmdW4gb3Jn LWZvb3Rub3RlLWdvdG8tcHJldmlvdXMtcmVmZXJlbmNlIChsYWJlbCkKZGlmZiAtLWdpdCBhL2xp c3Avb3JnLXByb3RvY29sLmVsIGIvbGlzcC9vcmctcHJvdG9jb2wuZWwKaW5kZXggMmYyYzU0Yi4u ZTVmODk2MSAxMDA2NDQKLS0tIGEvbGlzcC9vcmctcHJvdG9jb2wuZWwKKysrIGIvbGlzcC9vcmct cHJvdG9jb2wuZWwKQEAgLTU4MCw3ICs1ODAsNyBAQCBkZWxlZ2F0ZXMgbW9zdCBvZiB0aGUgd29y ayB0byBgb3JnLXByb3RvY29sLWNyZWF0ZScuIgogICAocmVxdWlyZSAnb3JnLXB1Ymxpc2gpCiAg IChsZXQgKChhbGwgKG9yIChvcmctcHVibGlzaC1nZXQtcHJvamVjdC1mcm9tLWZpbGVuYW1lIGJ1 ZmZlci1maWxlLW5hbWUpKSkpCiAgICAgKGlmIGFsbCAob3JnLXByb3RvY29sLWNyZWF0ZSAoY2Ry IGFsbCkpCi0gICAgICAobWVzc2FnZSAiTm90IGluIGFuIG9yZy1wcm9qZWN0LiAgRGlkIG1lYW4g JXM/IgorICAgICAgKG1lc3NhZ2UgIk5vdCBpbiBhbiBvcmctcHJvamVjdC4gIERpZCB5b3UgbWVh biBgJXMnPyIKICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlLWNvbW1hbmQta2V5cyJcXFtvcmct cHJvdG9jb2wtY3JlYXRlXSIpKSkpKQogCiAoZGVmdW4gb3JnLXByb3RvY29sLWNyZWF0ZSAoJm9w dGlvbmFsIHByb2plY3QtcGxpc3QpCmRpZmYgLS1naXQgYS9saXNwL29yZy10YWJsZS5lbCBiL2xp c3Avb3JnLXRhYmxlLmVsCmluZGV4IGU0M2YwZjguLmUyMWQzODYgMTAwNjQ0Ci0tLSBhL2xpc3Av b3JnLXRhYmxlLmVsCisrKyBiL2xpc3Avb3JnLXRhYmxlLmVsCkBAIC03OTUsOSArNzk1LDggQEAg V2hlbiBuaWwsIHNpbXBseSB3cml0ZSBcIiNFUlJPUlwiIGluIGNvcnJ1cHRlZCBmaWVsZHMuIikK ICAgICAgICAgICAgICAgICAgICAob3JnLWFkZC1wcm9wcyB4IG5pbAogICAgICAgICAgICAgICAg ICAgICAgJ2hlbHAtZWNobwogCQkgICAgIChjb25jYXQKLSAgICAgICAgICAgICAgICAgICAgICAo c3Vic3RpdHV0ZS1jb21tYW5kLWtleXMKLSAgICAgICAgICAgICAgICAgICAgICAgIkNsaXBwZWQg dGFibGUgZmllbGQsIHVzZSBcXFtvcmctdGFibGUtZWRpdC1maWVsZF0gdG8gXAotZWRpdC4gIEZ1 bGwgdmFsdWUgaXM6XG4iKQorCQkgICAgICAiQ2xpcHBlZCB0YWJsZSBmaWVsZCwgdXNlIGBcXFtv cmctdGFibGUtZWRpdC1maWVsZF0nIHRvIFwKK2VkaXQuICBGdWxsIHZhbHVlIGlzOlxuIgogICAg ICAgICAgICAgICAgICAgICAgIChzdWJzdHJpbmctbm8tcHJvcGVydGllcyB4KSkpCiAgICAgICAg ICAgICAgICAgICAgKGxldCAoKGwgKGxlbmd0aCB4KSkKICAgICAgICAgICAgICAgICAgICAgICAg ICAoZjEgKG1pbiBmbWF4CkBAIC0yMTM2LDExICsyMTM1LDEwIEBAIElmIE5MQVNUIGlzIGEgbnVt YmVyLCBvbmx5IHRoZSBOTEFTVCBmaWVsZHMgd2lsbCBhY3R1YWxseSBiZSBzdW1tZWQuIgogCQkJ ICAgcyBkaWZmKQogCQkgICAgIChmb3JtYXQgIiUuMGY6JTAyLjBmOiUwMi4wZiIgaCBtIHMpKSkp CiAJKGtpbGwtbmV3IHNyZXMpCi0JKGlmIChvcmctY2FsbGVkLWludGVyYWN0aXZlbHktcCAnaW50 ZXJhY3RpdmUpCi0JICAgIChtZXNzYWdlICIlcyIKLQkJICAgICAoc3Vic3RpdHV0ZS1jb21tYW5k LWtleXMKLQkJICAgICAgKGZvcm1hdCAiU3VtIG9mICVkIGl0ZW1zOiAlLTIwcyAgICAgKFxcW3lh bmtdIHdpbGwgaW5zZXJ0IHJlc3VsdCBpbnRvIGJ1ZmZlcikiCi0JCQkgICAgICAobGVuZ3RoIG51 bWJlcnMpIHNyZXMpKSkpCisJKHdoZW4gKG9yZy1jYWxsZWQtaW50ZXJhY3RpdmVseS1wICdpbnRl cmFjdGl2ZSkKKwkgICAgKG1lc3NhZ2UgIiVzIiAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMKKwkJ CSAgIChmb3JtYXQgIlN1bSBvZiAlZCBpdGVtczogJS0yMHMgICAgIFwKKyhcXFt5YW5rXSB3aWxs IGluc2VydCByZXN1bHQgaW50byBidWZmZXIpIiAobGVuZ3RoIG51bWJlcnMpIHNyZXMpKSkpCiAJ c3JlcykpKSkKIAogKGRlZnVuIG9yZy10YWJsZS1nZXQtbnVtYmVyLWZvci1zdW1taW5nIChzKQpA QCAtMzU5Nyw4ICszNTk1LDcgQEAgUGFyYW1ldGVycyBnZXQgcHJpb3JpdHkuIgogICAgICAgKHdo ZW4gKGVxIG9yZy10YWJsZS11c2Utc3RhbmRhcmQtcmVmZXJlbmNlcyB0KQogCShvcmctdGFibGUt ZmVkaXQtdG9nZ2xlLXJlZi10eXBlKSkKICAgICAgIChvcmctZ290by1saW5lIHN0YXJ0bGluZSkK LSAgICAgIChtZXNzYWdlCi0gICAgICAgKHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzICJcXDxvcmct bW9kZS1tYXA+XAorICAgICAgKG1lc3NhZ2UgIiVzIiAoc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMg IlxcPG9yZy1tb2RlLW1hcD5cCiBFZGl0IGZvcm11bGFzLCBmaW5pc2ggd2l0aCBgXFxbb3JnLWN0 cmwtYy1jdHJsLWNdJyBvciBgXFxbb3JnLWVkaXQtc3BlY2lhbF0nLiAgXAogU2VlIG1lbnUgZm9y IG1vcmUgY29tbWFuZHMuIikpKSkpCiAKLS0gCjIuNi4wLnJjMC4yNC5nZWMzNzFmZgoK --089e0115fa5c1d47a3052dc97fc7--