Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-init.el @ 197:acd284d43ca1 r20-3b25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents bfd6434d15b3
children
comparison
equal deleted inserted replaced
196:58e0786448ca 197:acd284d43ca1
875 (t (:inverse-video t))) 875 (t (:inverse-video t)))
876 "Face for highlighting the selected difference in buffer A." 876 "Face for highlighting the selected difference in buffer A."
877 :group 'ediff-highlighting) 877 :group 'ediff-highlighting)
878 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 878 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
879 ;; this variable is set to nil, then again to the appropriate face. 879 ;; this variable is set to nil, then again to the appropriate face.
880 (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A) 880 (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A
881 "Face for highlighting the selected difference in buffer A.
882 DO NOT CHANGE this variable. Instead, use the customization
883 widget to customize the actual face object `ediff-current-diff-face-A'
884 this variable represents.")
881 (ediff-hide-face 'ediff-current-diff-face-A) 885 (ediff-hide-face 'ediff-current-diff-face-A)
882 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 886 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
883 ;; This means that some user customization may be trashed. 887 ;; This means that some user customization may be trashed.
884 (if (and ediff-xemacs-p 888 (if (and ediff-xemacs-p
885 (ediff-has-face-support-p) 889 (ediff-has-face-support-p)
911 (t (:inverse-video t))) 915 (t (:inverse-video t)))
912 "Face for highlighting the selected difference in buffer B." 916 "Face for highlighting the selected difference in buffer B."
913 :group 'ediff-highlighting) 917 :group 'ediff-highlighting)
914 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 918 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
915 ;; this variable is set to nil, then again to the appropriate face. 919 ;; this variable is set to nil, then again to the appropriate face.
916 (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B) 920 (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B
921 "Face for highlighting the selected difference in buffer B.
922 this variable. Instead, use the customization
923 widget to customize the actual face `ediff-current-diff-face-B'
924 this variable represents.")
917 (ediff-hide-face 'ediff-current-diff-face-B) 925 (ediff-hide-face 'ediff-current-diff-face-B)
918 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 926 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
919 ;; This means that some user customization may be trashed. 927 ;; This means that some user customization may be trashed.
920 (if (and ediff-xemacs-p 928 (if (and ediff-xemacs-p
921 (ediff-has-face-support-p) 929 (ediff-has-face-support-p)
945 (t (:inverse-video t))) 953 (t (:inverse-video t)))
946 "Face for highlighting the selected difference in buffer C." 954 "Face for highlighting the selected difference in buffer C."
947 :group 'ediff-highlighting) 955 :group 'ediff-highlighting)
948 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 956 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
949 ;; this variable is set to nil, then again to the appropriate face. 957 ;; this variable is set to nil, then again to the appropriate face.
950 (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C) 958 (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C
959 "Face for highlighting the selected difference in buffer C.
960 DO NOT CHANGE this variable. Instead, use the customization
961 widget to customize the actual face object `ediff-current-diff-face-C'
962 this variable represents.")
951 (ediff-hide-face 'ediff-current-diff-face-C) 963 (ediff-hide-face 'ediff-current-diff-face-C)
952 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 964 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
953 ;; This means that some user customization may be trashed. 965 ;; This means that some user customization may be trashed.
954 (if (and ediff-xemacs-p 966 (if (and ediff-xemacs-p
955 (ediff-has-face-support-p) 967 (ediff-has-face-support-p)
971 (t (:inverse-video t))) 983 (t (:inverse-video t)))
972 "Face for highlighting the selected difference in buffer Ancestor." 984 "Face for highlighting the selected difference in buffer Ancestor."
973 :group 'ediff-highlighting) 985 :group 'ediff-highlighting)
974 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 986 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
975 ;; this variable is set to nil, then again to the appropriate face. 987 ;; this variable is set to nil, then again to the appropriate face.
976 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor) 988 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor
989 "Face for highlighting the selected difference in buffer Ancestor.
990 DO NOT CHANGE this variable. Instead, use the customization
991 widget to customize the actual face object `ediff-current-diff-face-Ancestor'
992 this variable represents.")
977 (ediff-hide-face 'ediff-current-diff-face-Ancestor) 993 (ediff-hide-face 'ediff-current-diff-face-Ancestor)
978 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 994 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
979 ;; This means that some user customization may be trashed. 995 ;; This means that some user customization may be trashed.
980 (if (and ediff-xemacs-p 996 (if (and ediff-xemacs-p
981 (ediff-has-face-support-p) 997 (ediff-has-face-support-p)
1013 (t (:underline t :stipple "gray3"))) 1029 (t (:underline t :stipple "gray3")))
1014 "Face for highlighting the refinement of the selected diff in buffer A." 1030 "Face for highlighting the refinement of the selected diff in buffer A."
1015 :group 'ediff-highlighting) 1031 :group 'ediff-highlighting)
1016 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1032 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1017 ;; this variable is set to nil, then again to the appropriate face. 1033 ;; this variable is set to nil, then again to the appropriate face.
1018 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A) 1034 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A
1035 "Face for highlighting the fine differences in buffer A.
1036 DO NOT CHANGE this variable. Instead, use the customization
1037 widget to customize the actual face object `ediff-fine-diff-face-A'
1038 this variable represents.")
1019 (ediff-hide-face 'ediff-fine-diff-face-A) 1039 (ediff-hide-face 'ediff-fine-diff-face-A)
1020 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1040 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1021 ;; This means that some use customization may be trashed. 1041 ;; This means that some use customization may be trashed.
1022 (if (and ediff-xemacs-p 1042 (if (and ediff-xemacs-p
1023 (ediff-has-face-support-p) 1043 (ediff-has-face-support-p)
1045 (t (:underline t :stipple "gray3"))) 1065 (t (:underline t :stipple "gray3")))
1046 "Face for highlighting the refinement of the selected diff in buffer B." 1066 "Face for highlighting the refinement of the selected diff in buffer B."
1047 :group 'ediff-highlighting) 1067 :group 'ediff-highlighting)
1048 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1068 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1049 ;; this variable is set to nil, then again to the appropriate face. 1069 ;; this variable is set to nil, then again to the appropriate face.
1050 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B) 1070 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B
1071 "Face for highlighting the fine differences in buffer B.
1072 DO NOT CHANGE this variable. Instead, use the customization
1073 widget to customize the actual face object `ediff-fine-diff-face-B'
1074 this variable represents.")
1051 (ediff-hide-face 'ediff-fine-diff-face-B) 1075 (ediff-hide-face 'ediff-fine-diff-face-B)
1052 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1076 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1053 ;; This means that some use customization may be trashed. 1077 ;; This means that some use customization may be trashed.
1054 (if (and ediff-xemacs-p 1078 (if (and ediff-xemacs-p
1055 (ediff-has-face-support-p) 1079 (ediff-has-face-support-p)
1078 (t (:underline t :stipple "gray3"))) 1102 (t (:underline t :stipple "gray3")))
1079 "Face for highlighting the refinement of the selected diff in buffer C." 1103 "Face for highlighting the refinement of the selected diff in buffer C."
1080 :group 'ediff-highlighting) 1104 :group 'ediff-highlighting)
1081 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1105 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1082 ;; this variable is set to nil, then again to the appropriate face. 1106 ;; this variable is set to nil, then again to the appropriate face.
1083 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C) 1107 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C
1108 "Face for highlighting the fine differences in buffer C.
1109 DO NOT CHANGE this variable. Instead, use the customization
1110 widget to customize the actual face object `ediff-fine-diff-face-C'
1111 this variable represents.")
1084 (ediff-hide-face 'ediff-fine-diff-face-C) 1112 (ediff-hide-face 'ediff-fine-diff-face-C)
1085 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1113 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1086 ;; This means that some use customization may be trashed. 1114 ;; This means that some use customization may be trashed.
1087 (if (and ediff-xemacs-p 1115 (if (and ediff-xemacs-p
1088 (ediff-has-face-support-p) 1116 (ediff-has-face-support-p)
1112 At present, this face is not used and no fine differences are computed for the 1140 At present, this face is not used and no fine differences are computed for the
1113 ancestor buffer." 1141 ancestor buffer."
1114 :group 'ediff-highlighting) 1142 :group 'ediff-highlighting)
1115 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1143 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1116 ;; this variable is set to nil, then again to the appropriate face. 1144 ;; this variable is set to nil, then again to the appropriate face.
1117 (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor) 1145 (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor
1146 "Face for highlighting the fine differences in buffer Ancestor.
1147 DO NOT CHANGE this variable. Instead, use the customization
1148 widget to customize the actual face object `ediff-fine-diff-face-Ancestor'
1149 this variable represents.")
1118 (ediff-hide-face 'ediff-fine-diff-face-Ancestor) 1150 (ediff-hide-face 'ediff-fine-diff-face-Ancestor)
1119 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1151 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1120 ;; This means that some use customization may be trashed. 1152 ;; This means that some use customization may be trashed.
1121 (if (and ediff-xemacs-p 1153 (if (and ediff-xemacs-p
1122 (ediff-has-face-support-p) 1154 (ediff-has-face-support-p)
1147 (t (:italic t :stipple "Stipple"))) 1179 (t (:italic t :stipple "Stipple")))
1148 "Face for highlighting even-numbered non-current differences in buffer A." 1180 "Face for highlighting even-numbered non-current differences in buffer A."
1149 :group 'ediff-highlighting) 1181 :group 'ediff-highlighting)
1150 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1182 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1151 ;; this variable is set to nil, then again to the appropriate face. 1183 ;; this variable is set to nil, then again to the appropriate face.
1152 (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A) 1184 (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A
1185 "Face for highlighting even-numbered non-current differences in buffer A.
1186 DO NOT CHANGE this variable. Instead, use the customization
1187 widget to customize the actual face object `ediff-even-diff-face-A'
1188 this variable represents.")
1153 (ediff-hide-face 'ediff-even-diff-face-A) 1189 (ediff-hide-face 'ediff-even-diff-face-A)
1154 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1190 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1155 ;; This means that some use customization may be trashed. 1191 ;; This means that some use customization may be trashed.
1156 (if (and ediff-xemacs-p 1192 (if (and ediff-xemacs-p
1157 (ediff-has-face-support-p) 1193 (ediff-has-face-support-p)
1181 (t (:italic t :stipple "Stipple"))) 1217 (t (:italic t :stipple "Stipple")))
1182 "Face for highlighting even-numbered non-current differences in buffer B." 1218 "Face for highlighting even-numbered non-current differences in buffer B."
1183 :group 'ediff-highlighting) 1219 :group 'ediff-highlighting)
1184 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1220 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1185 ;; this variable is set to nil, then again to the appropriate face. 1221 ;; this variable is set to nil, then again to the appropriate face.
1186 (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B) 1222 (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B
1223 "Face for highlighting even-numbered non-current differences in buffer B.
1224 DO NOT CHANGE this variable. Instead, use the customization
1225 widget to customize the actual face object `ediff-even-diff-face-B'
1226 this variable represents.")
1187 (ediff-hide-face 'ediff-even-diff-face-B) 1227 (ediff-hide-face 'ediff-even-diff-face-B)
1188 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1228 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1189 ;; This means that some use customization may be trashed. 1229 ;; This means that some use customization may be trashed.
1190 (if (and ediff-xemacs-p 1230 (if (and ediff-xemacs-p
1191 (ediff-has-face-support-p) 1231 (ediff-has-face-support-p)
1210 (t (:italic t :stipple "Stipple"))) 1250 (t (:italic t :stipple "Stipple")))
1211 "Face for highlighting even-numbered non-current differences in buffer C." 1251 "Face for highlighting even-numbered non-current differences in buffer C."
1212 :group 'ediff-highlighting) 1252 :group 'ediff-highlighting)
1213 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1253 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1214 ;; this variable is set to nil, then again to the appropriate face. 1254 ;; this variable is set to nil, then again to the appropriate face.
1215 (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C) 1255 (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C
1256 "Face for highlighting even-numbered non-current differences in buffer C.
1257 DO NOT CHANGE this variable. Instead, use the customization
1258 widget to customize the actual face object `ediff-even-diff-face-C'
1259 this variable represents.")
1216 (ediff-hide-face 'ediff-even-diff-face-C) 1260 (ediff-hide-face 'ediff-even-diff-face-C)
1217 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1261 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1218 ;; This means that some use customization may be trashed. 1262 ;; This means that some use customization may be trashed.
1219 (if (and ediff-xemacs-p 1263 (if (and ediff-xemacs-p
1220 (ediff-has-face-support-p) 1264 (ediff-has-face-support-p)
1240 (t (:italic t :stipple "Stipple"))) 1284 (t (:italic t :stipple "Stipple")))
1241 "Face for highlighting even-numbered non-current differences in the ancestor buffer." 1285 "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1242 :group 'ediff-highlighting) 1286 :group 'ediff-highlighting)
1243 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1287 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1244 ;; this variable is set to nil, then again to the appropriate face. 1288 ;; this variable is set to nil, then again to the appropriate face.
1245 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor) 1289 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor
1290 "Face for highlighting even-numbered non-current differences in buffer Ancestor.
1291 DO NOT CHANGE this variable. Instead, use the customization
1292 widget to customize the actual face object `ediff-even-diff-face-Ancestor'
1293 this variable represents.")
1246 (ediff-hide-face 'ediff-even-diff-face-Ancestor) 1294 (ediff-hide-face 'ediff-even-diff-face-Ancestor)
1247 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1295 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1248 ;; This means that some use customization may be trashed. 1296 ;; This means that some use customization may be trashed.
1249 (if (and ediff-xemacs-p 1297 (if (and ediff-xemacs-p
1250 (ediff-has-face-support-p) 1298 (ediff-has-face-support-p)
1282 (t (:italic t :stipple "gray1"))) 1330 (t (:italic t :stipple "gray1")))
1283 "Face for highlighting odd-numbered non-current differences in buffer A." 1331 "Face for highlighting odd-numbered non-current differences in buffer A."
1284 :group 'ediff-highlighting) 1332 :group 'ediff-highlighting)
1285 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1333 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1286 ;; this variable is set to nil, then again to the appropriate face. 1334 ;; this variable is set to nil, then again to the appropriate face.
1287 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A) 1335 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A
1336 "Face for highlighting odd-numbered non-current differences in buffer A.
1337 DO NOT CHANGE this variable. Instead, use the customization
1338 widget to customize the actual face object `ediff-odd-diff-face-A'
1339 this variable represents.")
1288 (ediff-hide-face 'ediff-odd-diff-face-A) 1340 (ediff-hide-face 'ediff-odd-diff-face-A)
1289 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1341 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1290 ;; This means that some use customization may be trashed. 1342 ;; This means that some use customization may be trashed.
1291 (if (and ediff-xemacs-p 1343 (if (and ediff-xemacs-p
1292 (ediff-has-face-support-p) 1344 (ediff-has-face-support-p)
1317 (t (:italic t :stipple "gray1"))) 1369 (t (:italic t :stipple "gray1")))
1318 "Face for highlighting odd-numbered non-current differences in buffer B." 1370 "Face for highlighting odd-numbered non-current differences in buffer B."
1319 :group 'ediff-highlighting) 1371 :group 'ediff-highlighting)
1320 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1372 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1321 ;; this variable is set to nil, then again to the appropriate face. 1373 ;; this variable is set to nil, then again to the appropriate face.
1322 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B) 1374 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B
1375 "Face for highlighting odd-numbered non-current differences in buffer B.
1376 DO NOT CHANGE this variable. Instead, use the customization
1377 widget to customize the actual face object `ediff-odd-diff-face-B'
1378 this variable represents.")
1323 (ediff-hide-face 'ediff-odd-diff-face-B) 1379 (ediff-hide-face 'ediff-odd-diff-face-B)
1324 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1380 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1325 ;; This means that some use customization may be trashed. 1381 ;; This means that some use customization may be trashed.
1326 (if (and ediff-xemacs-p 1382 (if (and ediff-xemacs-p
1327 (ediff-has-face-support-p) 1383 (ediff-has-face-support-p)
1345 (t (:italic t :stipple "gray1"))) 1401 (t (:italic t :stipple "gray1")))
1346 "Face for highlighting odd-numbered non-current differences in buffer C." 1402 "Face for highlighting odd-numbered non-current differences in buffer C."
1347 :group 'ediff-highlighting) 1403 :group 'ediff-highlighting)
1348 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1404 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1349 ;; this variable is set to nil, then again to the appropriate face. 1405 ;; this variable is set to nil, then again to the appropriate face.
1350 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C) 1406 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C
1407 "Face for highlighting odd-numbered non-current differences in buffer C.
1408 DO NOT CHANGE this variable. Instead, use the customization
1409 widget to customize the actual face object `ediff-odd-diff-face-C'
1410 this variable represents.")
1351 (ediff-hide-face 'ediff-odd-diff-face-C) 1411 (ediff-hide-face 'ediff-odd-diff-face-C)
1352 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1412 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1353 ;; This means that some use customization may be trashed. 1413 ;; This means that some use customization may be trashed.
1354 (if (and ediff-xemacs-p 1414 (if (and ediff-xemacs-p
1355 (ediff-has-face-support-p) 1415 (ediff-has-face-support-p)
1373 (t (:italic t :stipple "gray1"))) 1433 (t (:italic t :stipple "gray1")))
1374 "Face for highlighting odd-numbered non-current differences in the ancestor buffer." 1434 "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1375 :group 'ediff-highlighting) 1435 :group 'ediff-highlighting)
1376 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1436 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1377 ;; this variable is set to nil, then again to the appropriate face. 1437 ;; this variable is set to nil, then again to the appropriate face.
1378 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor) 1438 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor
1439 "Face for highlighting odd-numbered non-current differences in buffer Ancestor.
1440 DO NOT CHANGE this variable. Instead, use the customization
1441 widget to customize the actual face object `ediff-odd-diff-face-Ancestor'
1442 this variable represents.")
1379 (ediff-hide-face 'ediff-odd-diff-face-Ancestor) 1443 (ediff-hide-face 'ediff-odd-diff-face-Ancestor)
1380 ;; Until custom.el for XEmacs starts supporting :stipple we do this. 1444 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1381 ;; This means that some use customization may be trashed. 1445 ;; This means that some use customization may be trashed.
1382 (if (and ediff-xemacs-p 1446 (if (and ediff-xemacs-p
1383 (ediff-has-face-support-p) 1447 (ediff-has-face-support-p)