Mercurial > emacs
comparison lisp/ediff-init.el @ 57127:a4b2ce7d4d07
From Dan Nicolaescu <dann@ics.uci.edu>
(ediff-current-diff-face-A)
(ediff-current-diff-face-B, ediff-current-diff-face-C)
(ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use min-colors.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Fri, 17 Sep 2004 21:26:20 +0000 |
| parents | 575ec50746f9 |
| children | 905bf9de87af 0796fc36c2bd |
comparison
equal
deleted
inserted
replaced
| 57126:d46ee84c77e6 | 57127:a4b2ce7d4d07 |
|---|---|
| 900 (add-to-list 'facemenu-unlisted-faces face))) | 900 (add-to-list 'facemenu-unlisted-faces face))) |
| 901 | 901 |
| 902 | 902 |
| 903 | 903 |
| 904 (defface ediff-current-diff-face-A | 904 (defface ediff-current-diff-face-A |
| 905 '((((type tty)) (:foreground "blue3" :background "yellow3")) | 905 (if ediff-emacs-p |
| 906 (((class color)) (:foreground "firebrick" :background "pale green")) | 906 '((((class color) (min-colors 16)) |
| 907 (t (:inverse-video t))) | 907 (:foreground "firebrick" :background "pale green")) |
| 908 (((class color)) | |
| 909 (:foreground "blue3" :background "yellow3")) | |
| 910 (t (:inverse-video t))) | |
| 911 '((((type tty)) (:foreground "blue3" :background "yellow3")) | |
| 912 (((class color)) (:foreground "firebrick" :background "pale green")) | |
| 913 (t (:inverse-video t)))) | |
| 908 "Face for highlighting the selected difference in buffer A." | 914 "Face for highlighting the selected difference in buffer A." |
| 909 :group 'ediff-highlighting) | 915 :group 'ediff-highlighting) |
| 910 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 916 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 911 ;; this variable is set to nil, then again to the appropriate face. | 917 ;; this variable is set to nil, then again to the appropriate face. |
| 912 (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A | 918 (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A |
| 923 (copy-face 'modeline 'ediff-current-diff-face-A)) | 929 (copy-face 'modeline 'ediff-current-diff-face-A)) |
| 924 | 930 |
| 925 | 931 |
| 926 | 932 |
| 927 (defface ediff-current-diff-face-B | 933 (defface ediff-current-diff-face-B |
| 928 '((((type tty)) (:foreground "magenta3" :background "yellow3" | 934 (if ediff-emacs-p |
| 929 :weight bold)) | 935 '((((class color) (min-colors 16)) |
| 930 (((class color)) (:foreground "DarkOrchid" :background "Yellow")) | 936 (:foreground "DarkOrchid" :background "Yellow")) |
| 931 (t (:inverse-video t))) | 937 (((class color)) |
| 938 (:foreground "magenta3" :background "yellow3" | |
| 939 :weight bold)) | |
| 940 (t (:inverse-video t))) | |
| 941 '((((type tty)) (:foreground "magenta3" :background "yellow3" | |
| 942 :weight bold)) | |
| 943 (((class color)) (:foreground "DarkOrchid" :background "Yellow")) | |
| 944 (t (:inverse-video t)))) | |
| 932 "Face for highlighting the selected difference in buffer B." | 945 "Face for highlighting the selected difference in buffer B." |
| 933 :group 'ediff-highlighting) | 946 :group 'ediff-highlighting) |
| 934 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 947 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 935 ;; this variable is set to nil, then again to the appropriate face. | 948 ;; this variable is set to nil, then again to the appropriate face. |
| 936 (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B | 949 (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B |
| 946 (not (ediff-color-display-p))) | 959 (not (ediff-color-display-p))) |
| 947 (copy-face 'modeline 'ediff-current-diff-face-B)) | 960 (copy-face 'modeline 'ediff-current-diff-face-B)) |
| 948 | 961 |
| 949 | 962 |
| 950 (defface ediff-current-diff-face-C | 963 (defface ediff-current-diff-face-C |
| 951 '((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) | 964 (if ediff-emacs-p |
| 952 (((class color)) (:foreground "Navy" :background "Pink")) | 965 '((((class color) (min-colors 16)) |
| 953 (t (:inverse-video t))) | 966 (:foreground "Navy" :background "Pink")) |
| 967 (((class color)) | |
| 968 (:foreground "cyan3" :background "yellow3" :weight bold)) | |
| 969 (t (:inverse-video t))) | |
| 970 '((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) | |
| 971 (((class color)) (:foreground "Navy" :background "Pink")) | |
| 972 (t (:inverse-video t)))) | |
| 954 "Face for highlighting the selected difference in buffer C." | 973 "Face for highlighting the selected difference in buffer C." |
| 955 :group 'ediff-highlighting) | 974 :group 'ediff-highlighting) |
| 956 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 975 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 957 ;; this variable is set to nil, then again to the appropriate face. | 976 ;; this variable is set to nil, then again to the appropriate face. |
| 958 (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C | 977 (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C |
| 968 (not (ediff-color-display-p))) | 987 (not (ediff-color-display-p))) |
| 969 (copy-face 'modeline 'ediff-current-diff-face-C)) | 988 (copy-face 'modeline 'ediff-current-diff-face-C)) |
| 970 | 989 |
| 971 | 990 |
| 972 (defface ediff-current-diff-face-Ancestor | 991 (defface ediff-current-diff-face-Ancestor |
| 973 '((((type tty)) (:foreground "black" :background "magenta3")) | 992 (if ediff-emacs-p |
| 974 (((class color)) (:foreground "Black" :background "VioletRed")) | 993 '((((class color) (min-colors 16)) |
| 975 (t (:inverse-video t))) | 994 (:foreground "Black" :background "VioletRed")) |
| 995 (((class color)) | |
| 996 (:foreground "black" :background "magenta3")) | |
| 997 (t (:inverse-video t))) | |
| 998 '((((type tty)) (:foreground "black" :background "magenta3")) | |
| 999 (((class color)) (:foreground "Black" :background "VioletRed")) | |
| 1000 (t (:inverse-video t)))) | |
| 976 "Face for highlighting the selected difference in buffer Ancestor." | 1001 "Face for highlighting the selected difference in buffer Ancestor." |
| 977 :group 'ediff-highlighting) | 1002 :group 'ediff-highlighting) |
| 978 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1003 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 979 ;; this variable is set to nil, then again to the appropriate face. | 1004 ;; this variable is set to nil, then again to the appropriate face. |
| 980 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor | 1005 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor |
| 990 (not (ediff-color-display-p))) | 1015 (not (ediff-color-display-p))) |
| 991 (copy-face 'modeline 'ediff-current-diff-face-Ancestor)) | 1016 (copy-face 'modeline 'ediff-current-diff-face-Ancestor)) |
| 992 | 1017 |
| 993 | 1018 |
| 994 (defface ediff-fine-diff-face-A | 1019 (defface ediff-fine-diff-face-A |
| 995 '((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) | 1020 (if ediff-emacs-p |
| 996 (((class color)) (:foreground "Navy" :background "sky blue")) | 1021 '((((class color) (min-colors 16)) |
| 997 (t (:underline t :stipple "gray3"))) | 1022 (:foreground "Navy" :background "sky blue")) |
| 1023 (((class color)) | |
| 1024 (:foreground "white" :background "sky blue" :weight bold)) | |
| 1025 (t (:underline t :stipple "gray3"))) | |
| 1026 '((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) | |
| 1027 (((class color)) (:foreground "Navy" :background "sky blue")) | |
| 1028 (t (:underline t :stipple "gray3")))) | |
| 998 "Face for highlighting the refinement of the selected diff in buffer A." | 1029 "Face for highlighting the refinement of the selected diff in buffer A." |
| 999 :group 'ediff-highlighting) | 1030 :group 'ediff-highlighting) |
| 1000 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1031 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1001 ;; this variable is set to nil, then again to the appropriate face. | 1032 ;; this variable is set to nil, then again to the appropriate face. |
| 1002 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A | 1033 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A |
| 1005 widget to customize the actual face object `ediff-fine-diff-face-A' | 1036 widget to customize the actual face object `ediff-fine-diff-face-A' |
| 1006 this variable represents.") | 1037 this variable represents.") |
| 1007 (ediff-hide-face 'ediff-fine-diff-face-A) | 1038 (ediff-hide-face 'ediff-fine-diff-face-A) |
| 1008 | 1039 |
| 1009 (defface ediff-fine-diff-face-B | 1040 (defface ediff-fine-diff-face-B |
| 1010 '((((type tty)) (:foreground "magenta3" :background "cyan3")) | 1041 (if ediff-emacs-p |
| 1011 (((class color)) (:foreground "Black" :background "cyan")) | 1042 '((((class color) (min-colors 16)) |
| 1012 (t (:underline t :stipple "gray3"))) | 1043 (:foreground "Black" :background "cyan")) |
| 1044 (((class color)) | |
| 1045 (:foreground "magenta3" :background "cyan3")) | |
| 1046 (t (:underline t :stipple "gray3"))) | |
| 1047 '((((type tty)) (:foreground "magenta3" :background "cyan3")) | |
| 1048 (((class color)) (:foreground "Black" :background "cyan")) | |
| 1049 (t (:underline t :stipple "gray3")))) | |
| 1013 "Face for highlighting the refinement of the selected diff in buffer B." | 1050 "Face for highlighting the refinement of the selected diff in buffer B." |
| 1014 :group 'ediff-highlighting) | 1051 :group 'ediff-highlighting) |
| 1015 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1052 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1016 ;; this variable is set to nil, then again to the appropriate face. | 1053 ;; this variable is set to nil, then again to the appropriate face. |
| 1017 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B | 1054 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B |
| 1020 widget to customize the actual face object `ediff-fine-diff-face-B' | 1057 widget to customize the actual face object `ediff-fine-diff-face-B' |
| 1021 this variable represents.") | 1058 this variable represents.") |
| 1022 (ediff-hide-face 'ediff-fine-diff-face-B) | 1059 (ediff-hide-face 'ediff-fine-diff-face-B) |
| 1023 | 1060 |
| 1024 (defface ediff-fine-diff-face-C | 1061 (defface ediff-fine-diff-face-C |
| 1025 '((((type tty)) (:foreground "yellow3" :background "Turquoise" | 1062 (if ediff-emacs-p |
| 1026 :weight bold)) | 1063 '((((type pc)) |
| 1027 (((type pc)) (:foreground "white" :background "Turquoise")) | 1064 (:foreground "white" :background "Turquoise")) |
| 1028 (((class color)) (:foreground "Black" :background "Turquoise")) | 1065 (((class color) (min-colors 16)) |
| 1029 (t (:underline t :stipple "gray3"))) | 1066 (:foreground "Black" :background "Turquoise")) |
| 1067 (((class color)) | |
| 1068 (:foreground "yellow3" :background "Turquoise" | |
| 1069 :weight bold)) | |
| 1070 (t (:underline t :stipple "gray3"))) | |
| 1071 '((((type tty)) (:foreground "yellow3" :background "Turquoise" | |
| 1072 :weight bold)) | |
| 1073 (((type pc)) (:foreground "white" :background "Turquoise")) | |
| 1074 (((class color)) (:foreground "Black" :background "Turquoise")) | |
| 1075 (t (:underline t :stipple "gray3")))) | |
| 1030 "Face for highlighting the refinement of the selected diff in buffer C." | 1076 "Face for highlighting the refinement of the selected diff in buffer C." |
| 1031 :group 'ediff-highlighting) | 1077 :group 'ediff-highlighting) |
| 1032 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1078 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1033 ;; this variable is set to nil, then again to the appropriate face. | 1079 ;; this variable is set to nil, then again to the appropriate face. |
| 1034 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C | 1080 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C |
| 1037 widget to customize the actual face object `ediff-fine-diff-face-C' | 1083 widget to customize the actual face object `ediff-fine-diff-face-C' |
| 1038 this variable represents.") | 1084 this variable represents.") |
| 1039 (ediff-hide-face 'ediff-fine-diff-face-C) | 1085 (ediff-hide-face 'ediff-fine-diff-face-C) |
| 1040 | 1086 |
| 1041 (defface ediff-fine-diff-face-Ancestor | 1087 (defface ediff-fine-diff-face-Ancestor |
| 1042 '((((type tty)) (:foreground "red3" :background "green")) | 1088 (if ediff-emacs-p |
| 1043 (((class color)) (:foreground "Black" :background "Green")) | 1089 '((((class color) (min-colors 16)) |
| 1044 (t (:underline t :stipple "gray3"))) | 1090 (:foreground "Black" :background "Green")) |
| 1091 (((class color)) | |
| 1092 (:foreground "red3" :background "green")) | |
| 1093 (t (:underline t :stipple "gray3"))) | |
| 1094 '((((type tty)) (:foreground "red3" :background "green")) | |
| 1095 (((class color)) (:foreground "Black" :background "Green")) | |
| 1096 (t (:underline t :stipple "gray3")))) | |
| 1045 "Face for highlighting the refinement of the selected diff in the ancestor buffer. | 1097 "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 | 1098 At present, this face is not used and no fine differences are computed for the |
| 1047 ancestor buffer." | 1099 ancestor buffer." |
| 1048 :group 'ediff-highlighting) | 1100 :group 'ediff-highlighting) |
| 1049 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1101 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1063 ((and (boundp 'mswindowsx-bitmap-file-path) | 1115 ((and (boundp 'mswindowsx-bitmap-file-path) |
| 1064 (locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") | 1116 (locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") |
| 1065 (t "Stipple"))) | 1117 (t "Stipple"))) |
| 1066 | 1118 |
| 1067 (defface ediff-even-diff-face-A | 1119 (defface ediff-even-diff-face-A |
| 1068 `((((type tty)) (:foreground "red3" :background "light grey" | 1120 (if ediff-emacs-p |
| 1069 :weight bold)) | 1121 `((((type pc)) |
| 1070 (((type pc)) (:foreground "green3" :background "light grey")) | 1122 (:foreground "green3" :background "light grey")) |
| 1071 (((class color)) (:foreground "Black" :background "light grey")) | 1123 (((class color) (min-colors 16)) |
| 1072 (t (:italic t :stipple ,stipple-pixmap))) | 1124 (:foreground "Black" :background "light grey")) |
| 1125 (((class color)) | |
| 1126 (:foreground "red3" :background "light grey" | |
| 1127 :weight bold)) | |
| 1128 (t (:italic t :stipple ,stipple-pixmap))) | |
| 1129 `((((type tty)) (:foreground "red3" :background "light grey" | |
| 1130 :weight bold)) | |
| 1131 (((type pc)) (:foreground "green3" :background "light grey")) | |
| 1132 (((class color)) (:foreground "Black" :background "light grey")) | |
| 1133 (t (:italic t :stipple ,stipple-pixmap)))) | |
| 1073 "Face for highlighting even-numbered non-current differences in buffer A." | 1134 "Face for highlighting even-numbered non-current differences in buffer A." |
| 1074 :group 'ediff-highlighting) | 1135 :group 'ediff-highlighting) |
| 1075 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1136 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1076 ;; this variable is set to nil, then again to the appropriate face. | 1137 ;; this variable is set to nil, then again to the appropriate face. |
| 1077 (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A | 1138 (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A |
| 1080 widget to customize the actual face object `ediff-even-diff-face-A' | 1141 widget to customize the actual face object `ediff-even-diff-face-A' |
| 1081 this variable represents.") | 1142 this variable represents.") |
| 1082 (ediff-hide-face 'ediff-even-diff-face-A) | 1143 (ediff-hide-face 'ediff-even-diff-face-A) |
| 1083 | 1144 |
| 1084 (defface ediff-even-diff-face-B | 1145 (defface ediff-even-diff-face-B |
| 1085 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) | 1146 (if ediff-emacs-p |
| 1086 (((class color)) (:foreground "White" :background "Grey")) | 1147 `((((class color) (min-colors 16)) |
| 1087 (t (:italic t :stipple ,stipple-pixmap))) | 1148 (:foreground "White" :background "Grey")) |
| 1149 (((class color)) | |
| 1150 (:foreground "blue3" :background "Grey" :weight bold)) | |
| 1151 (t (:italic t :stipple ,stipple-pixmap))) | |
| 1152 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) | |
| 1153 (((class color)) (:foreground "White" :background "Grey")) | |
| 1154 (t (:italic t :stipple ,stipple-pixmap)))) | |
| 1088 "Face for highlighting even-numbered non-current differences in buffer B." | 1155 "Face for highlighting even-numbered non-current differences in buffer B." |
| 1089 :group 'ediff-highlighting) | 1156 :group 'ediff-highlighting) |
| 1090 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1157 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1091 ;; this variable is set to nil, then again to the appropriate face. | 1158 ;; this variable is set to nil, then again to the appropriate face. |
| 1092 (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B | 1159 (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B |
| 1095 widget to customize the actual face object `ediff-even-diff-face-B' | 1162 widget to customize the actual face object `ediff-even-diff-face-B' |
| 1096 this variable represents.") | 1163 this variable represents.") |
| 1097 (ediff-hide-face 'ediff-even-diff-face-B) | 1164 (ediff-hide-face 'ediff-even-diff-face-B) |
| 1098 | 1165 |
| 1099 (defface ediff-even-diff-face-C | 1166 (defface ediff-even-diff-face-C |
| 1100 `((((type tty)) (:foreground "yellow3" :background "light grey" | 1167 (if ediff-emacs-p |
| 1101 :weight bold)) | 1168 `((((type pc)) |
| 1102 (((type pc)) (:foreground "yellow3" :background "light grey")) | 1169 (:foreground "yellow3" :background "light grey")) |
| 1103 (((class color)) (:foreground "Black" :background "light grey")) | 1170 (((class color) (min-colors 16)) |
| 1104 (t (:italic t :stipple ,stipple-pixmap))) | 1171 (:foreground "Black" :background "light grey")) |
| 1172 (((class color)) | |
| 1173 (:foreground "yellow3" :background "light grey" | |
| 1174 :weight bold)) | |
| 1175 (t (:italic t :stipple ,stipple-pixmap))) | |
| 1176 `((((type tty)) (:foreground "yellow3" :background "light grey" | |
| 1177 :weight bold)) | |
| 1178 (((type pc)) (:foreground "yellow3" :background "light grey")) | |
| 1179 (((class color)) (:foreground "Black" :background "light grey")) | |
| 1180 (t (:italic t :stipple ,stipple-pixmap)))) | |
| 1105 "Face for highlighting even-numbered non-current differences in buffer C." | 1181 "Face for highlighting even-numbered non-current differences in buffer C." |
| 1106 :group 'ediff-highlighting) | 1182 :group 'ediff-highlighting) |
| 1107 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1183 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1108 ;; this variable is set to nil, then again to the appropriate face. | 1184 ;; this variable is set to nil, then again to the appropriate face. |
| 1109 (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C | 1185 (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C |
| 1112 widget to customize the actual face object `ediff-even-diff-face-C' | 1188 widget to customize the actual face object `ediff-even-diff-face-C' |
| 1113 this variable represents.") | 1189 this variable represents.") |
| 1114 (ediff-hide-face 'ediff-even-diff-face-C) | 1190 (ediff-hide-face 'ediff-even-diff-face-C) |
| 1115 | 1191 |
| 1116 (defface ediff-even-diff-face-Ancestor | 1192 (defface ediff-even-diff-face-Ancestor |
| 1117 `((((type tty)) (:foreground "cyan3" :background "light grey" | 1193 (if ediff-emacs-p |
| 1118 :weight bold)) | 1194 `((((type pc)) |
| 1119 (((type pc)) (:foreground "cyan3" :background "light grey")) | 1195 (:foreground "cyan3" :background "light grey")) |
| 1120 (((class color)) (:foreground "White" :background "Grey")) | 1196 (((class color) (min-colors 16)) |
| 1121 (t (:italic t :stipple ,stipple-pixmap))) | 1197 (:foreground "White" :background "Grey")) |
| 1198 (((class color)) | |
| 1199 (:foreground "cyan3" :background "light grey" | |
| 1200 :weight bold)) | |
| 1201 (t (:italic t :stipple ,stipple-pixmap))) | |
| 1202 `((((type tty)) (:foreground "cyan3" :background "light grey" | |
| 1203 :weight bold)) | |
| 1204 (((type pc)) (:foreground "cyan3" :background "light grey")) | |
| 1205 (((class color)) (:foreground "White" :background "Grey")) | |
| 1206 (t (:italic t :stipple ,stipple-pixmap)))) | |
| 1122 "Face for highlighting even-numbered non-current differences in the ancestor buffer." | 1207 "Face for highlighting even-numbered non-current differences in the ancestor buffer." |
| 1123 :group 'ediff-highlighting) | 1208 :group 'ediff-highlighting) |
| 1124 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1209 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1125 ;; this variable is set to nil, then again to the appropriate face. | 1210 ;; this variable is set to nil, then again to the appropriate face. |
| 1126 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor | 1211 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor |
| 1136 (B . ediff-even-diff-face-B) | 1221 (B . ediff-even-diff-face-B) |
| 1137 (C . ediff-even-diff-face-C) | 1222 (C . ediff-even-diff-face-C) |
| 1138 (Ancestor . ediff-even-diff-face-Ancestor))) | 1223 (Ancestor . ediff-even-diff-face-Ancestor))) |
| 1139 | 1224 |
| 1140 (defface ediff-odd-diff-face-A | 1225 (defface ediff-odd-diff-face-A |
| 1141 '((((type tty)) (:foreground "red3" :background "black" :weight bold)) | 1226 (if ediff-emacs-p |
| 1142 (((type pc)) (:foreground "green3" :background "gray40")) | 1227 '((((type pc)) |
| 1143 (((class color)) (:foreground "White" :background "Grey")) | 1228 (:foreground "green3" :background "gray40")) |
| 1144 (t (:italic t :stipple "gray1"))) | 1229 (((class color) (min-colors 16)) |
| 1230 (:foreground "White" :background "Grey")) | |
| 1231 (((class color)) | |
| 1232 (:foreground "red3" :background "black" :weight bold)) | |
| 1233 (t (:italic t :stipple "gray1"))) | |
| 1234 '((((type tty)) (:foreground "red3" :background "black" :weight bold)) | |
| 1235 (((type pc)) (:foreground "green3" :background "gray40")) | |
| 1236 (((class color)) (:foreground "White" :background "Grey")) | |
| 1237 (t (:italic t :stipple "gray1")))) | |
| 1145 "Face for highlighting odd-numbered non-current differences in buffer A." | 1238 "Face for highlighting odd-numbered non-current differences in buffer A." |
| 1146 :group 'ediff-highlighting) | 1239 :group 'ediff-highlighting) |
| 1147 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1240 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1148 ;; this variable is set to nil, then again to the appropriate face. | 1241 ;; this variable is set to nil, then again to the appropriate face. |
| 1149 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A | 1242 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A |
| 1153 this variable represents.") | 1246 this variable represents.") |
| 1154 (ediff-hide-face 'ediff-odd-diff-face-A) | 1247 (ediff-hide-face 'ediff-odd-diff-face-A) |
| 1155 | 1248 |
| 1156 | 1249 |
| 1157 (defface ediff-odd-diff-face-B | 1250 (defface ediff-odd-diff-face-B |
| 1158 '((((type tty)) (:foreground "cyan3" :background "black" :weight bold)) | 1251 (if ediff-emacs-p |
| 1159 (((type pc)) (:foreground "White" :background "gray40")) | 1252 '((((type pc)) |
| 1160 (((class color)) (:foreground "Black" :background "light grey")) | 1253 (:foreground "White" :background "gray40")) |
| 1161 (t (:italic t :stipple "gray1"))) | 1254 (((class color) (min-colors 16)) |
| 1255 (:foreground "Black" :background "light grey")) | |
| 1256 (((class color)) | |
| 1257 (:foreground "cyan3" :background "black" :weight bold)) | |
| 1258 (t (:italic t :stipple "gray1"))) | |
| 1259 '((((type tty)) (:foreground "cyan3" :background "black" :weight bold)) | |
| 1260 (((type pc)) (:foreground "White" :background "gray40")) | |
| 1261 (((class color)) (:foreground "Black" :background "light grey")) | |
| 1262 (t (:italic t :stipple "gray1")))) | |
| 1162 "Face for highlighting odd-numbered non-current differences in buffer B." | 1263 "Face for highlighting odd-numbered non-current differences in buffer B." |
| 1163 :group 'ediff-highlighting) | 1264 :group 'ediff-highlighting) |
| 1164 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1265 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1165 ;; this variable is set to nil, then again to the appropriate face. | 1266 ;; this variable is set to nil, then again to the appropriate face. |
| 1166 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B | 1267 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B |
| 1169 widget to customize the actual face object `ediff-odd-diff-face-B' | 1270 widget to customize the actual face object `ediff-odd-diff-face-B' |
| 1170 this variable represents.") | 1271 this variable represents.") |
| 1171 (ediff-hide-face 'ediff-odd-diff-face-B) | 1272 (ediff-hide-face 'ediff-odd-diff-face-B) |
| 1172 | 1273 |
| 1173 (defface ediff-odd-diff-face-C | 1274 (defface ediff-odd-diff-face-C |
| 1174 '((((type tty)) (:foreground "yellow3" :background "black" :weight bold)) | 1275 (if ediff-emacs-p |
| 1175 (((type pc)) (:foreground "yellow3" :background "gray40")) | 1276 '((((type pc)) |
| 1176 (((class color)) (:foreground "White" :background "Grey")) | 1277 (:foreground "yellow3" :background "gray40")) |
| 1177 (t (:italic t :stipple "gray1"))) | 1278 (((class color) (min-colors 16)) |
| 1279 (:foreground "White" :background "Grey")) | |
| 1280 (((class color)) | |
| 1281 (:foreground "yellow3" :background "black" :weight bold)) | |
| 1282 (t (:italic t :stipple "gray1"))) | |
| 1283 '((((type tty)) (:foreground "yellow3" :background "black" :weight bold)) | |
| 1284 (((type pc)) (:foreground "yellow3" :background "gray40")) | |
| 1285 (((class color)) (:foreground "White" :background "Grey")) | |
| 1286 (t (:italic t :stipple "gray1")))) | |
| 1178 "Face for highlighting odd-numbered non-current differences in buffer C." | 1287 "Face for highlighting odd-numbered non-current differences in buffer C." |
| 1179 :group 'ediff-highlighting) | 1288 :group 'ediff-highlighting) |
| 1180 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1289 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1181 ;; this variable is set to nil, then again to the appropriate face. | 1290 ;; this variable is set to nil, then again to the appropriate face. |
| 1182 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C | 1291 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C |
| 1185 widget to customize the actual face object `ediff-odd-diff-face-C' | 1294 widget to customize the actual face object `ediff-odd-diff-face-C' |
| 1186 this variable represents.") | 1295 this variable represents.") |
| 1187 (ediff-hide-face 'ediff-odd-diff-face-C) | 1296 (ediff-hide-face 'ediff-odd-diff-face-C) |
| 1188 | 1297 |
| 1189 (defface ediff-odd-diff-face-Ancestor | 1298 (defface ediff-odd-diff-face-Ancestor |
| 1190 '((((type tty)) (:foreground "green3" :background "black" :weight bold)) | 1299 (if ediff-emacs-p |
| 1191 (((class color)) (:foreground "cyan3" :background "gray40")) | 1300 '((((class color) (min-colors 16)) |
| 1192 (t (:italic t :stipple "gray1"))) | 1301 (:foreground "cyan3" :background "gray40")) |
| 1302 (((class color)) | |
| 1303 (:foreground "green3" :background "black" :weight bold)) | |
| 1304 (t (:italic t :stipple "gray1"))) | |
| 1305 '((((type tty)) (:foreground "green3" :background "black" :weight bold)) | |
| 1306 (((class color)) (:foreground "cyan3" :background "gray40")) | |
| 1307 (t (:italic t :stipple "gray1")))) | |
| 1193 "Face for highlighting odd-numbered non-current differences in the ancestor buffer." | 1308 "Face for highlighting odd-numbered non-current differences in the ancestor buffer." |
| 1194 :group 'ediff-highlighting) | 1309 :group 'ediff-highlighting) |
| 1195 ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1310 ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| 1196 ;; this variable is set to nil, then again to the appropriate face. | 1311 ;; this variable is set to nil, then again to the appropriate face. |
| 1197 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor | 1312 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor |