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:
Kyle Meyer 2017-10-13 15:13:38 -04:00
parent 86e6ab697c 3f1d5f9091
commit 8184de6e13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-faces.el
View File

@ -291,7 +291,7 @@ determines if it is a foreground or a background color."
(defcustom org-priority-faces nil
"Faces for specific Priorities.
This is a list of cons cells, with priority character in the car
and faces in the cdr. The face can be a symbol, a color as
and faces in the cdr. The face can be a symbol, a color
as a string, or a property list of attributes, like
(:foreground \"blue\" :weight bold :underline t).
If it is a color string, the variable `org-faces-easy-properties'

2
lisp/org-inlinetask.el
View File

@ -114,7 +114,7 @@ When nil, the first star is not shown."
(defcustom org-inlinetask-default-state nil
"Non-nil means make inline tasks have a TODO keyword initially.
This should be the state `org-inlinetask-insert-task' should use by
default, or nil of no state should be assigned."
default, or nil if no state should be assigned."
:group 'org-inlinetask
:version "24.1"
:type '(choice