diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-10-13 15:13:38 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-10-13 15:13:38 -0400 |
commit | 8184de6e1371bc9cc5f4d4efb4660621c1d18d0a (patch) | |
tree | 8418535015f2fe577524522e206cfe6938a3e9b7 | |
parent | 86e6ab697c0a63cc21a8c1a6289f7832ea540cff (diff) | |
parent | 3f1d5f9091a76b9a3063ac3fe837727c07a3518f (diff) | |
download | org-mode-8184de6e1371bc9cc5f4d4efb4660621c1d18d0a.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-faces.el | 2 | ||||
-rw-r--r-- | lisp/org-inlinetask.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 53538e6..eab9f3e 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -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' diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index 5c1054c..1bf574a 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -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 |