ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-02-01 15:43:18 +01:00
parent 3134725ad8 76c08ea77b
commit 13b18ea5e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/orgmanual.org
View File

@ -16760,7 +16760,7 @@ region even if the cursor moves across a special context.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(add-hook 'org-mode-hook (add-hook 'org-mode-hook
(lambda () (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))) (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
#+end_src #+end_src

2
doc/org.texi
View File

@ -17661,7 +17661,7 @@ fixed this problem:
@lisp @lisp
(add-hook 'org-mode-hook (add-hook 'org-mode-hook
(lambda () (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))) (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
@end lisp @end lisp