emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Loïc Estève" <loic.esteve@ymail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: Replace deprecated org-set-local by setq-local in the documentation
Date: Wed, 1 Feb 2017 13:31:58 +0100	[thread overview]
Message-ID: <395baa44-d09a-0053-1bc1-600d5931880a@ymail.com> (raw)
In-Reply-To: <87shnykvxj.fsf@nicolasgoaziou.fr>

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]


> 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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: replace-org-set-local.patch --]
[-- Type: text/x-patch; name="replace-org-set-local.patch", Size: 1293 bytes --]

commit ce1d662c4a8647cf9c01dd5a2e661e937964741d
Author: Loïc Estève <loic.esteve@ymail.com>
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
 

  reply	other threads:[~2017-02-01 12:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-01  9:34 Replace deprecated org-set-local by setq-local in the documentation Loïc Estève
2017-02-01 11:11 ` Nicolas Goaziou
2017-02-01 12:31   ` Loïc Estève [this message]
2017-02-01 14:46     ` Nicolas Goaziou
2017-02-01 15:24       ` Loïc Estève

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=395baa44-d09a-0053-1bc1-600d5931880a@ymail.com \
    --to=loic.esteve@ymail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=mail@nicolasgoaziou.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).