From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Horn Subject: [PATCH] Fix conflict doc Date: Tue, 11 Jan 2011 01:19:58 -0500 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=20cf3054a51f1522c404998c145f Return-path: Received: from [140.186.70.92] (port=46654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcXae-0008D9-TE for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 01:20:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcXad-0008Jl-6Y for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 01:20:20 -0500 Received: from mail-fx0-f41.google.com ([209.85.161.41]:57923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcXad-0008Jh-11 for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 01:20:19 -0500 Received: by fxm12 with SMTP id 12so13070806fxm.0 for ; Mon, 10 Jan 2011 22:20:18 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org-mode ml --20cf3054a51f1522c404998c145f Content-Type: text/plain; charset=ISO-8859-1 (Eric, mind glancing at the patch?) In regard to the following message: http://article.gmane.org/gmane.emacs.orgmode/35931 This patch incorporates Eric Schulte's method of making org-mode work with yasnippet into the documentation. -- Jeffrey Horn http://www.failuretorefrain.com/jeff/ --20cf3054a51f1522c404998c145f Content-Type: application/octet-stream; name="fix-conflict-doc.patch" Content-Disposition: attachment; filename="fix-conflict-doc.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gisewfmt0 RnJvbSAxYTY3OThiMTE3ZDE2M2JhNTFjZmM4OTBlYjVhYTBhZjY1NTMyMTY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmcmV5IEhvcm4gPGpyaG9ybjQyNEBnbWFpbC5jb20+CkRh dGU6IFR1ZSwgMTEgSmFuIDIwMTEgMDE6MDI6MjUgLTA1MDAKU3ViamVjdDogW1BBVENIXSBVcGRh dGUgY29uZmxpY3QgZG9jdW1lbnRhdGlvbgoKVGhpcyBwYXRjaCB1cGRhdGVzIHRoZSBjb25mbGlj dCBkb2N1bWVudGF0aW9uIHJlZ2FyZGluZyB5YXNuaXBwZXQgdG8gdXNlIEVyaWMgU2NodWx0ZSdz IGZpeC4KLS0tCiBkb2Mvb3JnLnRleGkgfCAgIDIxICsrKysrKysrKysrKysrKysrKysrLQogMSBm aWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RvYy9vcmcudGV4aSBiL2RvYy9vcmcudGV4aQppbmRleCBlODM5MDlkLi5iMDY2N2U0IDEw MDY0NAotLS0gYS9kb2Mvb3JnLnRleGkKKysrIGIvZG9jL29yZy50ZXhpCkBAIC0xMzQyMyw3ICsx MzQyMyw3IEBAIHRvIGhhdmUgb3RoZXIgcmVwbGFjZW1lbnQga2V5cywgbG9vayBhdCB0aGUgdmFy aWFibGUKIAogQGl0ZW0gQGZpbGV7eWFzbmlwcGV0LmVsfQogQGNpbmRleCBAZmlsZXt5YXNuaXBw ZXQuZWx9Ci1UaGUgd2F5IE9yZy1tb2RlIGJpbmRzIHRoZSBUQUIga2V5IChiaW5kaW5nIHRvIEBj b2Rle1t0YWJdfSBpbnN0ZWFkIG9mCitUaGUgd2F5IE9yZyBtb2RlIGJpbmRzIHRoZSBUQUIga2V5 IChiaW5kaW5nIHRvIEBjb2Rle1t0YWJdfSBpbnN0ZWFkIG9mCiBAY29kZXsiXHQifSkgb3ZlcnJ1 bGVzIFlBU25pcHBldCdzIGFjY2VzcyB0byB0aGlzIGtleS4gIFRoZSBmb2xsb3dpbmcgY29kZQog Zml4ZWQgdGhpcyBwcm9ibGVtOgogCkBAIC0xMzQzNCw2ICsxMzQzNCwyNSBAQCBmaXhlZCB0aGlz IHByb2JsZW06CiAgICAgICAgICAgICAoZGVmaW5lLWtleSB5YXMva2V5bWFwIFt0YWJdICd5YXMv bmV4dC1maWVsZC1ncm91cCkpKQogQGVuZCBsaXNwCiAKK1RoZSBsYXRlc3QgdmVyc2lvbiBvZiB5 YXNuaXBwZXRzIGRvZXNuJ3QgcGxheSB3ZWxsIHdpdGggT3JnIG1vZGUuIElmIHRoZQorYWJvdmUg Y29kZSBkb2VzIG5vdCBmaXggdGhlIGNvbmZsaWN0LCBzdGFydCBieSBkZWZpbmluZyB0aGUgZm9s bG93aW5nCitmdW5jdGlvbjoKK0BsaXNwCisoZGVmdW4geWFzL29yZy12ZXJ5LXNhZmUtZXhwYW5k ICgpCisgICAgICAgKGxldCAoKHlhcy9mYWxsYmFjay1iZWhhdmlvciAncmV0dXJuLW5pbCkpICh5 YXMvZXhwYW5kKSkpCitAZW5kIGxpc3AKKworVGhlbiwgdGVsbCBPcmcgbW9kZSB3aGF0IHRvIGRv IHdpdGggdGhlIG5ldyBmdW5jdGlvbjoKK0BsaXNwCisoYWRkLWhvb2sgJ29yZy1tb2RlLWhvb2sK KyAgICAgICAgICAobGFtYmRhICgpCisgICAgICAgICAgICAgIChtYWtlLXZhcmlhYmxlLWJ1ZmZl ci1sb2NhbCAneWFzL3RyaWdnZXIta2V5KQorICAgICAgICAgICAgICAoc2V0cSB5YXMvdHJpZ2dl ci1rZXkgW3RhYl0pCisgICAgICAgICAgICAgIChhZGQtdG8tbGlzdCAnb3JnLXRhYi1maXJzdC1o b29rICd5YXMvb3JnLXZlcnktc2FmZS1leHBhbmQpCisgICAgICAgICAgICAgIChkZWZpbmUta2V5 IHlhcy9rZXltYXAgW3RhYl0gJ3lhcy9uZXh0LWZpZWxkKQorICAgICAgICAgICAgICApKQorQGVu ZCBsaXNwCisKIEBpdGVtIEBmaWxle3dpbmRtb3ZlLmVsfSBieSBIb3ZhdiBTaGFjaGFtCiBAY2lu ZGV4IEBmaWxle3dpbmRtb3ZlLmVsfQogVGhpcyBwYWNrYWdlIGFsc28gdXNlcyB0aGUgQGtiZHtT LTxjdXJzb3I+fSBrZXlzLCBzbyBldmVyeXRoaW5nIHdyaXR0ZW4KLS0gCjEuNy4yCgo= --20cf3054a51f1522c404998c145f Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --20cf3054a51f1522c404998c145f--