From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?TG/Dr2MgRXN0w6h2ZQ==?= Subject: Re: Replace deprecated org-set-local by setq-local in the documentation Date: Wed, 1 Feb 2017 13:31:58 +0100 Message-ID: <395baa44-d09a-0053-1bc1-600d5931880a@ymail.com> References: <2aefa658-239d-c04f-0bba-792b20d37feb@ymail.com> <87shnykvxj.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------B7D990E618E95A25F0C8F529" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYu50-0002Lz-5N for emacs-orgmode@gnu.org; Wed, 01 Feb 2017 07:32:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYu4v-0000MJ-Fi for emacs-orgmode@gnu.org; Wed, 01 Feb 2017 07:32:06 -0500 Received: from nm27-vm8.bullet.mail.ir2.yahoo.com ([212.82.97.59]:54934) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cYu4v-0000Ll-6o for emacs-orgmode@gnu.org; Wed, 01 Feb 2017 07:32:01 -0500 In-Reply-To: <87shnykvxj.fsf@nicolasgoaziou.fr> 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" To: Nicolas Goaziou Cc: emacs-orgmode@gnu.org This is a multi-part message in MIME format. --------------B7D990E618E95A25F0C8F529 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit > Could you send the patch on this ML so that I can apply it? > > You will need to add TINYCHANGE at the end of the commit message if you > haven't signed FSF papers yet. Thanks for your prompt reply, I attached the patch. I tried my best to follow the instructions in http://orgmode.org/worg/org-contribute.html. Let me know if I need to change something. Cheers, Loïc --------------B7D990E618E95A25F0C8F529 Content-Type: text/x-patch; name="replace-org-set-local.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="replace-org-set-local.patch" commit ce1d662c4a8647cf9c01dd5a2e661e937964741d Author: Loïc Estève Date: Wed Feb 1 09:44:05 2017 +0100 Replace org-set-local by setq-local in the documentation * contrib/orgmanual.org (Conflicts): Update yasnippet instructions. * doc/org.texi (Packages that conflict with Org mode): Update yasnippet instructions TINYCHANGE diff --git a/contrib/orgmanual.org b/contrib/orgmanual.org index d2275af..21011cd 100644 --- a/contrib/orgmanual.org +++ b/contrib/orgmanual.org @@ -16760,7 +16760,7 @@ region even if the cursor moves across a special context. #+begin_src emacs-lisp (add-hook 'org-mode-hook (lambda () - (org-set-local 'yas/trigger-key [tab]) + (setq-local yas/trigger-key [tab]) (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand))) #+end_src diff --git a/doc/org.texi b/doc/org.texi index f68ef6e..4c3e140 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -17661,7 +17661,7 @@ fixed this problem: @lisp (add-hook 'org-mode-hook (lambda () - (org-set-local 'yas/trigger-key [tab]) + (setq-local yas/trigger-key [tab]) (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand))) @end lisp --------------B7D990E618E95A25F0C8F529--