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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-21 11:02:15 +02:00
parent 40baaf8626 6cb676f65a
commit 5abc82b3ab
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/lisp/org-wikinodes.el
View File

@ -115,7 +115,7 @@ variable `org-wikinodes-scope'.
If a target headline is not found, it may be created according to the If a target headline is not found, it may be created according to the
setting of `org-wikinodes-create-targets'." setting of `org-wikinodes-create-targets'."
(if current-prefix-arg (org-wikinodes-clear-direcory-targets-cache)) (if current-prefix-arg (org-wikinodes-clear-directory-targets-cache))
(let ((create org-wikinodes-create-targets) (let ((create org-wikinodes-create-targets)
visiting buffer m pos file rpl) visiting buffer m pos file rpl)
(setq pos (setq pos
@ -184,10 +184,10 @@ setting of `org-wikinodes-create-targets'."
(org-in-regexp (format org-complex-heading-regexp-format (org-in-regexp (format org-complex-heading-regexp-format
org-wikinodes-camel-regexp)) org-wikinodes-camel-regexp))
(org-in-regexp org-wikinodes-camel-regexp)) (org-in-regexp org-wikinodes-camel-regexp))
(org-wikinodes-clear-direcory-targets-cache) (org-wikinodes-clear-directory-targets-cache)
t)) t))
(defun org-wikinodes-clear-direcory-targets-cache () (defun org-wikinodes-clear-directory-targets-cache ()
"Clear the cache where to find wiki targets." "Clear the cache where to find wiki targets."
(interactive) (interactive)
(setq org-wikinodes-directory-targets-cache nil) (setq org-wikinodes-directory-targets-cache nil)

12
doc/org.texi
View File

@ -15389,6 +15389,18 @@ Yes, these are unfortunately more difficult to remember. If you want
to have other replacement keys, look at the variable to have other replacement keys, look at the variable
@code{org-disputed-keys}. @code{org-disputed-keys}.
@item @file{filladapt.el} by Kyle Jones
@cindex @file{filladapt.el}
Org mode tries to do the right thing when filling paragraphs, list items and
other elements. Many users reported they had problems using both
@file{filladapt.el} and Org mode, so a safe thing to do is to disable it like
this:
@lisp
(add-hook 'org-mode-hook 'turn-off-filladapt-mode)
@end lisp
@item @file{yasnippet.el} @item @file{yasnippet.el}
@cindex @file{yasnippet.el} @cindex @file{yasnippet.el}
The way Org mode binds the TAB key (binding to @code{[tab]} instead of The way Org mode binds the TAB key (binding to @code{[tab]} instead of