aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJan Djärv2013-11-01 16:47:10 +0100
committerJan Djärv2013-11-01 16:47:10 +0100
commit3c334c1412e708585fddba61b7f91e0902a830f4 (patch)
treefb063b9f306719816335d12601735648e4fbba41 /lisp
parent9bc236c8263bc81f1b540579a9f98d872ab2da46 (diff)
downloademacs-3c334c1412e708585fddba61b7f91e0902a830f4.tar.gz
emacs-3c334c1412e708585fddba61b7f91e0902a830f4.zip
Add :distant-foreground to faces.
* doc/lispref/display.texi (Face Attributes): Document :distant-foreground. * etc/NEWS: Mention :distant-foreground. * lisp/faces.el (face-x-resources): Add :distant-foreground. (region): Use :distant-foreground for gtk and ns. * src/dispextern.h (lface_attribute_index): Add LFACE_DISTANT_FOREGROUND_INDEX. * src/xfaces.c: Declare color_distance. (QCdistant_foreground): New variable. (NEAR_SAME_COLOR_THRESHOLD): New define. (load_color2): New function. (load_color): Call load_color2. (load_face_colors): Call load_color2 and if distant-color is specified calculate distant and use distant-color if colors are near. (LFACE_DISTANT_FOREGROUND): New define. (merge_face_ref, Finternal_set_lisp_face_attribute) (Finternal_get_lisp_face_attribute) (x_supports_face_attributes_p): Handle distant-foreground similar to foreground. (syms_of_xfaces): DEFSYM QCdistant_foreground.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/faces.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1493945af38..b71b808fec8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-11-01 Jan Djärv <jan.h.d@swipnet.se>
2
3 * faces.el (face-x-resources): Add :distant-foreground.
4 (region): Use :distant-foreground for gtk and ns.
5
12013-11-01 Tassilo Horn <tsdh@gnu.org> 62013-11-01 Tassilo Horn <tsdh@gnu.org>
2 7
3 Allow multiple bibliographies when BibLaTeX is used rathen than 8 Allow multiple bibliographies when BibLaTeX is used rathen than
diff --git a/lisp/faces.el b/lisp/faces.el
index 9aef744b037..8ff93874de0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -274,6 +274,8 @@ If FRAME is omitted or nil, use the selected frame."
274 (:weight (".attributeWeight" . "Face.AttributeWeight")) 274 (:weight (".attributeWeight" . "Face.AttributeWeight"))
275 (:slant (".attributeSlant" . "Face.AttributeSlant")) 275 (:slant (".attributeSlant" . "Face.AttributeSlant"))
276 (:foreground (".attributeForeground" . "Face.AttributeForeground")) 276 (:foreground (".attributeForeground" . "Face.AttributeForeground"))
277 (:distant-foreground
278 (".attributeDistantForeground" . "Face.AttributeDistantForeground"))
277 (:background (".attributeBackground" . "Face.AttributeBackground")) 279 (:background (".attributeBackground" . "Face.AttributeBackground"))
278 (:overline (".attributeOverline" . "Face.AttributeOverline")) 280 (:overline (".attributeOverline" . "Face.AttributeOverline"))
279 (:strike-through (".attributeStrikeThrough" . "Face.AttributeStrikeThrough")) 281 (:strike-through (".attributeStrikeThrough" . "Face.AttributeStrikeThrough"))
@@ -2255,10 +2257,10 @@ terminal type to a different value."
2255 '((((class color) (min-colors 88) (background dark)) 2257 '((((class color) (min-colors 88) (background dark))
2256 :background "blue3") 2258 :background "blue3")
2257 (((class color) (min-colors 88) (background light) (type gtk)) 2259 (((class color) (min-colors 88) (background light) (type gtk))
2258 :foreground "gtk_selection_fg_color" 2260 :distant-foreground "gtk_selection_fg_color"
2259 :background "gtk_selection_bg_color") 2261 :background "gtk_selection_bg_color")
2260 (((class color) (min-colors 88) (background light) (type ns)) 2262 (((class color) (min-colors 88) (background light) (type ns))
2261 :foreground "ns_selection_fg_color" 2263 :distant-foreground "ns_selection_fg_color"
2262 :background "ns_selection_bg_color") 2264 :background "ns_selection_bg_color")
2263 (((class color) (min-colors 88) (background light)) 2265 (((class color) (min-colors 88) (background light))
2264 :background "lightgoldenrod2") 2266 :background "lightgoldenrod2")