mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-12 01:45:46 +01:00
parent 6340a78c9f ff0748beac
commit 3375671e83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/org.texi
View File

@ -17355,7 +17355,7 @@ If the cursor is on a @code{#+TBLFM} line, re-apply the formulas to
the entire table.
@item
If the current buffer is a capture buffer, close the note and file it. With
a prefix argument, jump to the target location, without capturing anything.
a prefix argument, also jump to the target location upon storing the note.
@item
If the cursor is on a @code{<<<target>>>}, update radio targets and
corresponding links in this buffer.

5
lisp/org.el
View File

@ -932,8 +932,9 @@ the following lines anywhere in the buffer:
#+STARTUP: content
#+STARTUP: showeverything
Set `org-agenda-inhibit-startup' to a non-nil value so as to
ignore this option when Org opens agenda files for the first time."
Set `org-agenda-inhibit-startup' to a non-nil value if you want
to ignore this option when Org opens agenda files for the first
time."
:group 'org-startup
:type '(choice
(const :tag "nofold: show all" nil)