Mercurial > emacs
comparison lisp/faces.el @ 83067:b44978264e1d
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-118
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-120
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-107
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 28 Feb 2004 04:52:40 +0000 |
| parents | 1d7467694692 ea359827d26a |
| children | 34a7a8f40548 |
comparison
equal
deleted
inserted
replaced
| 83066:887bb2eb4a89 | 83067:b44978264e1d |
|---|---|
| 1 ;;; faces.el --- Lisp faces | 1 ;;; faces.el --- Lisp faces |
| 2 | 2 |
| 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | 3 ;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004 |
| 4 ;; Free Software Foundation, Inc. | 4 ;; Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Maintainer: FSF | 6 ;; Maintainer: FSF |
| 7 ;; Keywords: internal | 7 ;; Keywords: internal |
| 8 | 8 |
| 1312 (and (memq 'lucid options) | 1312 (and (memq 'lucid options) |
| 1313 (featurep 'x-toolkit) | 1313 (featurep 'x-toolkit) |
| 1314 (not (featurep 'motif))) | 1314 (not (featurep 'motif))) |
| 1315 (and (memq 'x-toolkit options) | 1315 (and (memq 'x-toolkit options) |
| 1316 (featurep 'x-toolkit)))) | 1316 (featurep 'x-toolkit)))) |
| 1317 ((eq req 'min-colors) | |
| 1318 (>= (display-color-cells frame) (car options))) | |
| 1317 ((eq req 'class) | 1319 ((eq req 'class) |
| 1318 (memq (frame-parameter frame 'display-type) options)) | 1320 (memq (frame-parameter frame 'display-type) options)) |
| 1319 ((eq req 'background) | 1321 ((eq req 'background) |
| 1320 (memq (frame-parameter frame 'background-mode) | 1322 (memq (frame-parameter frame 'background-mode) |
| 1321 options)) | 1323 options)) |
| 1890 | 1892 |
| 1891 (setq minibuffer-prompt-properties | 1893 (setq minibuffer-prompt-properties |
| 1892 (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt))) | 1894 (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt))) |
| 1893 | 1895 |
| 1894 (defface region | 1896 (defface region |
| 1895 '((((type tty) (class color)) | 1897 '((((class color) (min-colors 88) (background dark)) |
| 1898 :background "blue3") | |
| 1899 (((class color) (min-colors 88) (background light)) | |
| 1900 :background "lightgoldenrod2") | |
| 1901 (((class color) (min-colors 16) (background dark)) | |
| 1902 :background "blue3") | |
| 1903 (((class color) (min-colors 16) (background light)) | |
| 1904 :background "lightgoldenrod2") | |
| 1905 (((class color) (min-colors 8)) | |
| 1896 :background "blue" :foreground "white") | 1906 :background "blue" :foreground "white") |
| 1897 (((type tty) (class mono)) | 1907 (((type tty) (class mono)) |
| 1898 :inverse-video t) | 1908 :inverse-video t) |
| 1899 (((class color) (background dark)) | |
| 1900 :background "blue3") | |
| 1901 (((class color) (background light)) | |
| 1902 :background "lightgoldenrod2") | |
| 1903 (t :background "gray")) | 1909 (t :background "gray")) |
| 1904 "Basic face for highlighting the region." | 1910 "Basic face for highlighting the region." |
| 1905 :version "21.1" | 1911 :version "21.1" |
| 1906 :group 'basic-faces) | 1912 :group 'basic-faces) |
| 1907 | 1913 |
| 1988 "Basic underlined face." | 1994 "Basic underlined face." |
| 1989 :group 'basic-faces) | 1995 :group 'basic-faces) |
| 1990 | 1996 |
| 1991 | 1997 |
| 1992 (defface highlight | 1998 (defface highlight |
| 1993 '((((type tty) (class color)) | 1999 '((((class color) (min-colors 88) (background light)) |
| 2000 :background "darkseagreen2") | |
| 2001 (((class color) (min-colors 88) (background dark)) | |
| 2002 :background "darkolivegreen") | |
| 2003 (((class color) (min-colors 16) (background light)) | |
| 2004 :background "darkseagreen2") | |
| 2005 (((class color) (min-colors 16) (background dark)) | |
| 2006 :background "darkolivegreen") | |
| 2007 (((class color) (min-colors 8)) | |
| 1994 :background "green" :foreground "black") | 2008 :background "green" :foreground "black") |
| 1995 (((class color) (background light)) | |
| 1996 :background "darkseagreen2") | |
| 1997 (((class color) (background dark)) | |
| 1998 :background "darkolivegreen") | |
| 1999 (t :inverse-video t)) | 2009 (t :inverse-video t)) |
| 2000 "Basic face for highlighting." | 2010 "Basic face for highlighting." |
| 2001 :group 'basic-faces) | 2011 :group 'basic-faces) |
| 2002 | 2012 |
| 2003 | 2013 |
| 2004 (defface secondary-selection | 2014 (defface secondary-selection |
| 2005 '((((type tty) (class color)) | 2015 '((((class color) (min-colors 88) (background light)) |
| 2016 :background "yellow") | |
| 2017 (((class color) (min-colors 88) (background dark)) | |
| 2018 :background "SkyBlue4") | |
| 2019 (((class color) (min-colors 16) (background light)) | |
| 2020 :background "yellow") | |
| 2021 (((class color) (min-colors 16) (background dark)) | |
| 2022 :background "SkyBlue4") | |
| 2023 (((class color) (min-colors 8)) | |
| 2006 :background "cyan" :foreground "black") | 2024 :background "cyan" :foreground "black") |
| 2007 (((class color) (background light)) | |
| 2008 :background "yellow") | |
| 2009 (((class color) (background dark)) | |
| 2010 :background "SkyBlue4") | |
| 2011 (t :inverse-video t)) | 2025 (t :inverse-video t)) |
| 2012 "Basic face for displaying the secondary selection." | 2026 "Basic face for displaying the secondary selection." |
| 2013 :group 'basic-faces) | 2027 :group 'basic-faces) |
| 2014 | 2028 |
| 2015 | 2029 |