X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/322b7dab59b98b5d8625d2cd29e48f1ce605f769..2f885dcacb7fdc09700705e15b7741988d2ad70f:/lisp/org/org-faces.el diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index e5877768fe..58f879dd51 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -1,11 +1,10 @@ ;;; org-faces.el --- Face definitions for Org-mode. -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.4 ;; ;; This file is part of GNU Emacs. ;; @@ -50,6 +49,11 @@ :tag "Org Faces" :group 'org-appearance) +(defface org-default + (org-compatible-face 'default nil) + "Face used for default text." + :group 'org-faces) + (defface org-hide '((((background light)) (:foreground "white")) (((background dark)) (:foreground "black"))) @@ -136,7 +140,7 @@ color of the frame." :group 'org-faces) (defface org-special-keyword ;; originally copied from font-lock-string-face - (org-compatible-face nil + (org-compatible-face 'font-lock-keyword-face '((((class color) (min-colors 16) (background light)) (:foreground "RosyBrown")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSalmon")) (t (:italic t)))) @@ -246,7 +250,10 @@ column view defines special faces for each outline level. See the file :group 'org-faces) (defface org-link - '((t :inherit link)) + (org-compatible-face 'link + '((((class color) (background light)) (:foreground "Purple" :underline t)) + (((class color) (background dark)) (:foreground "Cyan" :underline t)) + (t (:underline t)))) "Face for links." :group 'org-faces) @@ -278,6 +285,16 @@ column view defines special faces for each outline level. See the file "Face for date/time stamps." :group 'org-faces) +(defface org-date-selected + (org-compatible-face nil + '((((class color) (min-colors 16) (background light)) (:foreground "Red1" :bold nil)) + (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :bold nil)) + (((class color) (min-colors 8) (background light)) (:foreground "red" :bold nil)) + (((class color) (min-colors 8) (background dark)) (:foreground "red" :bold nil)) + (t (:inverse-video t)))) + "Face for highlighting the calendar day when using `org-read-date'." + :group 'org-faces) + (defface org-sexp-date '((((class color) (background light)) (:foreground "Purple")) (((class color) (background dark)) (:foreground "Cyan")) @@ -318,7 +335,7 @@ specific tags." (((class color) (min-colors 8)) (:foreground "green")) (t (:bold nil)))) "Face used in agenda, to indicate lines switched to DONE. -This face is used to de-emphasize items that where brightly colord in the +This face is used to de-emphasize items that where brightly colored in the agenda because they were things to do, or overdue. The DONE state itself is of course immediately visible, but for example a passed deadline is \(by default) very bright read. This face could be simply the default face @@ -344,6 +361,7 @@ keywords will then be interpreted as either foreground or background color." :group 'org-faces :group 'org-todo + :version "24.1" :type '(repeat (cons (choice (const todo) (const tag) (const priority)) (choice (const :foreground) (const :background))))) @@ -507,6 +525,15 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." :group 'org-faces :version "22.1") +(defface org-block-background '((t ())) + "Face used for the source block background.") + +(org-copy-face 'org-meta-line 'org-block-begin-line + "Face used for the line delimiting the begin of source blocks.") + +(org-copy-face 'org-meta-line 'org-block-end-line + "Face used for the line delimiting the end of source blocks.") + (defface org-verbatim (org-compatible-face 'shadow '((((class color grayscale) (min-colors 88) (background light)) @@ -531,6 +558,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." When nil, format these as normal Org. This is the default, because the content of these blocks will still be treated as Org syntax." :group 'org-faces + :version "24.1" :type 'boolean) (defface org-clock-overlay ;; copied from secondary-selection @@ -656,6 +684,18 @@ month and 365.24 days for a year)." "Face for showing the agenda restriction lock." :group 'org-faces) +(defface org-agenda-filter-tags + (org-compatible-face 'modeline + nil) + "Face for tag(s) in the mode-line when filtering the agenda." + :group 'org-faces) + +(defface org-agenda-filter-category + (org-compatible-face 'modeline + nil) + "Face for tag(s) in the mode-line when filtering the agenda." + :group 'org-faces) + (defface org-time-grid ;; originally copied from font-lock-variable-name-face (org-compatible-face nil '((((class color) (min-colors 16) (background light)) (:foreground "DarkGoldenrod")) @@ -664,12 +704,27 @@ month and 365.24 days for a year)." "Face used for time grids." :group 'org-faces) +(org-copy-face 'org-time-grid 'org-agenda-current-time + "Face used to show the current time in the time grid.") + (defface org-agenda-diary (org-compatible-face 'default nil) "Face used for agenda entries that come from the Emacs diary." :group 'org-faces) +(defface org-agenda-calendar-event + (org-compatible-face 'default + nil) + "Face used to show events and appointments in the agenda." + :group 'org-faces) + +(defface org-agenda-calendar-sexp + (org-compatible-face 'default + nil) + "Face used to show events computed from a S-expression." + :group 'org-faces) + (defconst org-level-faces '(org-level-1 org-level-2 org-level-3 org-level-4 org-level-5 org-level-6 org-level-7 org-level-8 @@ -689,6 +744,7 @@ If nil, then all levels >=org-n-level-faces are styled like level org-n-level-faces" :group 'org-appearance :group 'org-faces + :version "24.1" :type 'boolean) (defface org-latex-and-export-specials @@ -715,5 +771,4 @@ level org-n-level-faces" (provide 'org-faces) - ;;; org-faces.el ends here