瀏覽代碼

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>
Nicolas Goaziou 10 年之前
父節點
當前提交
c763faf529
共有 1 個文件被更改,包括 12 次插入11 次删除
  1. 12 11
      lisp/org-agenda.el

+ 12 - 11
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."
   "Make highest priority lines bold, and lowest italic."
   (interactive)
   (interactive)
   (mapc (lambda (o) (if (eq (overlay-get o 'org-type) 'org-priority)
   (mapc (lambda (o) (if (eq (overlay-get o 'org-type) 'org-priority)
-			(delete-overlay o)))
+		   (delete-overlay o)))
 	(overlays-in (point-min) (point-max)))
 	(overlays-in (point-min) (point-max)))
   (save-excursion
   (save-excursion
     (let (b e p ov h l)
     (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))
 	      ov (make-overlay b e))
 	(overlay-put
 	(overlay-put
 	 ov 'face
 	 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)))))
 	(overlay-put ov 'org-type 'org-priority)))))
 
 
 (defvar org-depend-tag-blocked)
 (defvar org-depend-tag-blocked)