comparison src/xfaces.c @ 109358:a9586dc942d5

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Mon, 12 Jul 2010 13:21:11 +0000
parents 06b03915afed
children 89a16701cde1
comparison
equal deleted inserted replaced
109240:6f0915b37828 109358:a9586dc942d5
5603 { 5603 {
5604 /* Remove the former face. */ 5604 /* Remove the former face. */
5605 struct face *former_face = cache->faces_by_id[former_face_id]; 5605 struct face *former_face = cache->faces_by_id[former_face_id];
5606 uncache_face (cache, former_face); 5606 uncache_face (cache, former_face);
5607 free_realized_face (cache->f, former_face); 5607 free_realized_face (cache->f, former_face);
5608 SET_FRAME_GARBAGED (cache->f);
5608 } 5609 }
5609 5610
5610 if (FRAME_WINDOW_P (cache->f)) 5611 if (FRAME_WINDOW_P (cache->f))
5611 face = realize_x_face (cache, attrs); 5612 face = realize_x_face (cache, attrs);
5612 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) 5613 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f))
6788 Each element is of the form: 6789 Each element is of the form:
6789 6790
6790 (FACE REPLACEMENT...), 6791 (FACE REPLACEMENT...),
6791 6792
6792 which causes display of the face FACE to use REPLACEMENT... instead. 6793 which causes display of the face FACE to use REPLACEMENT... instead.
6793 REPLACEMENT... is interpreted the same way the value of a `face' text 6794 REPLACEMENT... is interpreted the same way as the value of a `face'
6794 property is: it may be (1) A face name, (2) A list of face names, (3) A 6795 text property: it may be (1) A face name, (2) A list of face names,
6795 property-list of face attribute/value pairs, or (4) A list of face names 6796 (3) A property-list of face attribute/value pairs, or (4) A list of
6796 intermixed with lists containing face attribute/value pairs. 6797 face names or lists containing face attribute/value pairs.
6797 6798
6798 Multiple entries in REPLACEMENT... are merged together to form the final 6799 Multiple entries in REPLACEMENT... are merged together to form the final
6799 result, with faces or attributes earlier in the list taking precedence 6800 result, with faces or attributes earlier in the list taking precedence
6800 over those that are later. 6801 over those that are later.
6801 6802
6815 Making this variable buffer-local is a good way to allow buffer-specific 6816 Making this variable buffer-local is a good way to allow buffer-specific
6816 face definitions. For instance, the mode my-mode could define a face 6817 face definitions. For instance, the mode my-mode could define a face
6817 `my-mode-default', and then in the mode setup function, do: 6818 `my-mode-default', and then in the mode setup function, do:
6818 6819
6819 (set (make-local-variable 'face-remapping-alist) 6820 (set (make-local-variable 'face-remapping-alist)
6820 '((default my-mode-default)))). */); 6821 '((default my-mode-default)))).
6822
6823 Because Emacs normally only redraws screen areas when the underlying
6824 buffer contents change, you may need to call `redraw-display' after
6825 changing this variable for it to take effect. */);
6821 Vface_remapping_alist = Qnil; 6826 Vface_remapping_alist = Qnil;
6822 6827
6823 DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist, 6828 DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist,
6824 doc: /* Alist of fonts vs the rescaling factors. 6829 doc: /* Alist of fonts vs the rescaling factors.
6825 Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where 6830 Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where