Merge branch 'maint'

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
 

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