902 |
|
|
903 |
|
|
904 |
(defface ediff-current-diff-face-A |
(defface ediff-current-diff-face-A |
905 |
'((((class color)) (:foreground "firebrick" :background "pale green")) |
'((((type tty)) (:foreground "blue3" :background "yellow3")) |
906 |
(t (:inverse-video t))) |
(((class color)) (:foreground "firebrick" :background "pale green")) |
907 |
|
(t (:inverse-video t))) |
908 |
"Face for highlighting the selected difference in buffer A." |
"Face for highlighting the selected difference in buffer A." |
909 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
910 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
925 |
|
|
926 |
|
|
927 |
(defface ediff-current-diff-face-B |
(defface ediff-current-diff-face-B |
928 |
'((((class color)) (:foreground "DarkOrchid" :background "Yellow")) |
'((((type tty)) (:foreground "magenta3" :background "yellow3" |
929 |
(t (:inverse-video t))) |
:weight bold)) |
930 |
|
(((class color)) (:foreground "DarkOrchid" :background "Yellow")) |
931 |
|
(t (:inverse-video t))) |
932 |
"Face for highlighting the selected difference in buffer B." |
"Face for highlighting the selected difference in buffer B." |
933 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
934 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
948 |
|
|
949 |
|
|
950 |
(defface ediff-current-diff-face-C |
(defface ediff-current-diff-face-C |
951 |
'((((class color)) (:foreground "Navy" :background "Pink")) |
'((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) |
952 |
(t (:inverse-video t))) |
(((class color)) (:foreground "Navy" :background "Pink")) |
953 |
|
(t (:inverse-video t))) |
954 |
"Face for highlighting the selected difference in buffer C." |
"Face for highlighting the selected difference in buffer C." |
955 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
956 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
970 |
|
|
971 |
|
|
972 |
(defface ediff-current-diff-face-Ancestor |
(defface ediff-current-diff-face-Ancestor |
973 |
'((((class color)) (:foreground "Black" :background "VioletRed")) |
'((((type tty)) (:foreground "black" :background "magenta3")) |
974 |
|
(((class color)) (:foreground "Black" :background "VioletRed")) |
975 |
(t (:inverse-video t))) |
(t (:inverse-video t))) |
976 |
"Face for highlighting the selected difference in buffer Ancestor." |
"Face for highlighting the selected difference in buffer Ancestor." |
977 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
992 |
|
|
993 |
|
|
994 |
(defface ediff-fine-diff-face-A |
(defface ediff-fine-diff-face-A |
995 |
'((((class color)) (:foreground "Navy" :background "sky blue")) |
'((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) |
996 |
|
(((class color)) (:foreground "Navy" :background "sky blue")) |
997 |
(t (:underline t :stipple "gray3"))) |
(t (:underline t :stipple "gray3"))) |
998 |
"Face for highlighting the refinement of the selected diff in buffer A." |
"Face for highlighting the refinement of the selected diff in buffer A." |
999 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1007 |
(ediff-hide-face 'ediff-fine-diff-face-A) |
(ediff-hide-face 'ediff-fine-diff-face-A) |
1008 |
|
|
1009 |
(defface ediff-fine-diff-face-B |
(defface ediff-fine-diff-face-B |
1010 |
'((((class color)) (:foreground "Black" :background "cyan")) |
'((((type tty)) (:foreground "magenta3" :background "cyan3")) |
1011 |
(t (:underline t :stipple "gray3"))) |
(((class color)) (:foreground "Black" :background "cyan")) |
1012 |
|
(t (:underline t :stipple "gray3"))) |
1013 |
"Face for highlighting the refinement of the selected diff in buffer B." |
"Face for highlighting the refinement of the selected diff in buffer B." |
1014 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1015 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1022 |
(ediff-hide-face 'ediff-fine-diff-face-B) |
(ediff-hide-face 'ediff-fine-diff-face-B) |
1023 |
|
|
1024 |
(defface ediff-fine-diff-face-C |
(defface ediff-fine-diff-face-C |
1025 |
'((((class color)) (:foreground "Black" :background "Turquoise")) |
'((((type tty)) (:foreground "yellow3" :background "Turquoise" |
1026 |
|
:weight bold)) |
1027 |
|
(((type pc)) (:foreground "white" :background "Turquoise")) |
1028 |
|
(((class color)) (:foreground "Black" :background "Turquoise")) |
1029 |
(t (:underline t :stipple "gray3"))) |
(t (:underline t :stipple "gray3"))) |
1030 |
"Face for highlighting the refinement of the selected diff in buffer C." |
"Face for highlighting the refinement of the selected diff in buffer C." |
1031 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1039 |
(ediff-hide-face 'ediff-fine-diff-face-C) |
(ediff-hide-face 'ediff-fine-diff-face-C) |
1040 |
|
|
1041 |
(defface ediff-fine-diff-face-Ancestor |
(defface ediff-fine-diff-face-Ancestor |
1042 |
'((((class color)) (:foreground "Black" :background "Green")) |
'((((type tty)) (:foreground "red3" :background "green")) |
1043 |
(t (:underline t :stipple "gray3"))) |
(((class color)) (:foreground "Black" :background "Green")) |
1044 |
|
(t (:underline t :stipple "gray3"))) |
1045 |
"Face for highlighting the refinement of the selected diff in the ancestor buffer. |
"Face for highlighting the refinement of the selected diff in the ancestor buffer. |
1046 |
At present, this face is not used and no fine differences are computed for the |
At present, this face is not used and no fine differences are computed for the |
1047 |
ancestor buffer." |
ancestor buffer." |
1065 |
(t "Stipple"))) |
(t "Stipple"))) |
1066 |
|
|
1067 |
(defface ediff-even-diff-face-A |
(defface ediff-even-diff-face-A |
1068 |
`((((class color)) (:foreground "Black" :background "light grey")) |
`((((type tty)) (:foreground "red3" :background "light grey" |
1069 |
(t (:italic t :stipple ,stipple-pixmap))) |
:weight bold)) |
1070 |
|
(((type pc)) (:foreground "green3" :background "light grey")) |
1071 |
|
(((class color)) (:foreground "Black" :background "light grey")) |
1072 |
|
(t (:italic t :stipple ,stipple-pixmap))) |
1073 |
"Face for highlighting even-numbered non-current differences in buffer A." |
"Face for highlighting even-numbered non-current differences in buffer A." |
1074 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1075 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1082 |
(ediff-hide-face 'ediff-even-diff-face-A) |
(ediff-hide-face 'ediff-even-diff-face-A) |
1083 |
|
|
1084 |
(defface ediff-even-diff-face-B |
(defface ediff-even-diff-face-B |
1085 |
`((((class color)) (:foreground "White" :background "Grey")) |
`((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) |
1086 |
(t (:italic t :stipple ,stipple-pixmap))) |
(((class color)) (:foreground "White" :background "Grey")) |
1087 |
|
(t (:italic t :stipple ,stipple-pixmap))) |
1088 |
"Face for highlighting even-numbered non-current differences in buffer B." |
"Face for highlighting even-numbered non-current differences in buffer B." |
1089 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1090 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1097 |
(ediff-hide-face 'ediff-even-diff-face-B) |
(ediff-hide-face 'ediff-even-diff-face-B) |
1098 |
|
|
1099 |
(defface ediff-even-diff-face-C |
(defface ediff-even-diff-face-C |
1100 |
`((((class color)) (:foreground "Black" :background "light grey")) |
`((((type tty)) (:foreground "yellow3" :background "light grey" |
1101 |
(t (:italic t :stipple ,stipple-pixmap))) |
:weight bold)) |
1102 |
|
(((type pc)) (:foreground "yellow3" :background "light grey")) |
1103 |
|
(((class color)) (:foreground "Black" :background "light grey")) |
1104 |
|
(t (:italic t :stipple ,stipple-pixmap))) |
1105 |
"Face for highlighting even-numbered non-current differences in buffer C." |
"Face for highlighting even-numbered non-current differences in buffer C." |
1106 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1107 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1114 |
(ediff-hide-face 'ediff-even-diff-face-C) |
(ediff-hide-face 'ediff-even-diff-face-C) |
1115 |
|
|
1116 |
(defface ediff-even-diff-face-Ancestor |
(defface ediff-even-diff-face-Ancestor |
1117 |
`((((class color)) (:foreground "White" :background "Grey")) |
`((((type tty)) (:foreground "cyan3" :background "light grey" |
1118 |
|
:weight bold)) |
1119 |
|
(((type pc)) (:foreground "cyan3" :background "light grey")) |
1120 |
|
(((class color)) (:foreground "White" :background "Grey")) |
1121 |
(t (:italic t :stipple ,stipple-pixmap))) |
(t (:italic t :stipple ,stipple-pixmap))) |
1122 |
"Face for highlighting even-numbered non-current differences in the ancestor buffer." |
"Face for highlighting even-numbered non-current differences in the ancestor buffer." |
1123 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1138 |
(Ancestor . ediff-even-diff-face-Ancestor))) |
(Ancestor . ediff-even-diff-face-Ancestor))) |
1139 |
|
|
1140 |
(defface ediff-odd-diff-face-A |
(defface ediff-odd-diff-face-A |
1141 |
'((((class color)) (:foreground "White" :background "Grey")) |
'((((type tty)) (:foreground "red3" :background "black" :weight bold)) |
1142 |
(t (:italic t :stipple "gray1"))) |
(((type pc)) (:foreground "green3" :background "gray40")) |
1143 |
|
(((class color)) (:foreground "White" :background "Grey")) |
1144 |
|
(t (:italic t :stipple "gray1"))) |
1145 |
"Face for highlighting odd-numbered non-current differences in buffer A." |
"Face for highlighting odd-numbered non-current differences in buffer A." |
1146 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1147 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1155 |
|
|
1156 |
|
|
1157 |
(defface ediff-odd-diff-face-B |
(defface ediff-odd-diff-face-B |
1158 |
'((((class color)) (:foreground "Black" :background "light grey")) |
'((((type tty)) (:foreground "cyan3" :background "black" :weight bold)) |
1159 |
(t (:italic t :stipple "gray1"))) |
(((type pc)) (:foreground "White" :background "gray40")) |
1160 |
|
(((class color)) (:foreground "Black" :background "light grey")) |
1161 |
|
(t (:italic t :stipple "gray1"))) |
1162 |
"Face for highlighting odd-numbered non-current differences in buffer B." |
"Face for highlighting odd-numbered non-current differences in buffer B." |
1163 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1164 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1171 |
(ediff-hide-face 'ediff-odd-diff-face-B) |
(ediff-hide-face 'ediff-odd-diff-face-B) |
1172 |
|
|
1173 |
(defface ediff-odd-diff-face-C |
(defface ediff-odd-diff-face-C |
1174 |
'((((class color)) (:foreground "White" :background "Grey")) |
'((((type tty)) (:foreground "yellow3" :background "black" :weight bold)) |
1175 |
(t (:italic t :stipple "gray1"))) |
(((type pc)) (:foreground "yellow3" :background "gray40")) |
1176 |
|
(((class color)) (:foreground "White" :background "Grey")) |
1177 |
|
(t (:italic t :stipple "gray1"))) |
1178 |
"Face for highlighting odd-numbered non-current differences in buffer C." |
"Face for highlighting odd-numbered non-current differences in buffer C." |
1179 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1180 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1187 |
(ediff-hide-face 'ediff-odd-diff-face-C) |
(ediff-hide-face 'ediff-odd-diff-face-C) |
1188 |
|
|
1189 |
(defface ediff-odd-diff-face-Ancestor |
(defface ediff-odd-diff-face-Ancestor |
1190 |
'((((class color)) (:foreground "Black" :background "light grey")) |
'((((type tty)) (:foreground "green3" :background "black" :weight bold)) |
1191 |
(t (:italic t :stipple "gray1"))) |
(((class color)) (:foreground "cyan3" :background "gray40")) |
1192 |
|
(t (:italic t :stipple "gray1"))) |
1193 |
"Face for highlighting odd-numbered non-current differences in the ancestor buffer." |
"Face for highlighting odd-numbered non-current differences in the ancestor buffer." |
1194 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1195 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |