summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-04-29 23:29:36 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-04-29 23:29:36 +0200
commitc763faf529ef2e8f257a27df29531a4f77d633f5 (patch)
treecfc3a163873cf25a8b4a493cdc855cc27f15aa05
parent8cc7b72160b2214311526aa072175d580e648aff (diff)
downloadorg-mode-c763faf529ef2e8f257a27df29531a4f77d633f5.tar.gz
org-agenda: Fix invalid face error for priority #B
* lisp/org-agenda.el (org-agenda-fontify-priorities): Ensure face doesn't inherit from nil. Reported-by: Renato <renatofdds@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/97253>
-rw-r--r--lisp/org-agenda.el23
1 files changed, 12 insertions, 11 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 403f621..4241f44 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3782,7 +3782,7 @@ FILTER-ALIST is an alist of filters we need to apply when
"Make highest priority lines bold, and lowest italic."
(interactive)
(mapc (lambda (o) (if (eq (overlay-get o 'org-type) 'org-priority)
- (delete-overlay o)))
+ (delete-overlay o)))
(overlays-in (point-min) (point-max)))
(save-excursion
(let (b e p ov h l)
@@ -3800,16 +3800,17 @@ FILTER-ALIST is an alist of filters we need to apply when
ov (make-overlay b e))
(overlay-put
ov 'face
- (cons (cond ((org-face-from-face-or-color
- 'priority nil
- (cdr (assoc p org-priority-faces))))
- ((and (listp org-agenda-fontify-priorities)
- (org-face-from-face-or-color
- 'priority nil
- (cdr (assoc p org-agenda-fontify-priorities)))))
- ((equal p l) 'italic)
- ((equal p h) 'bold))
- 'org-priority))
+ (let ((special-face
+ (cond ((org-face-from-face-or-color
+ 'priority nil
+ (cdr (assoc p org-priority-faces))))
+ ((and (listp org-agenda-fontify-priorities)
+ (org-face-from-face-or-color
+ 'priority nil
+ (cdr (assoc p org-agenda-fontify-priorities)))))
+ ((equal p l) 'italic)
+ ((equal p h) 'bold))))
+ (if special-face (list special-face 'org-priority) 'org-priority)))
(overlay-put ov 'org-type 'org-priority)))))
(defvar org-depend-tag-blocked)