903 |
|
|
904 |
|
|
905 |
|
|
906 |
(defface ediff-current-diff-face-A |
(defface ediff-current-diff-A |
907 |
(if ediff-emacs-p |
(if ediff-emacs-p |
908 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
909 |
(:foreground "firebrick" :background "pale green")) |
(:foreground "firebrick" :background "pale green")) |
915 |
(t (:inverse-video t)))) |
(t (:inverse-video t)))) |
916 |
"Face for highlighting the selected difference in buffer A." |
"Face for highlighting the selected difference in buffer A." |
917 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
918 |
|
;; backward-compatibility alias |
919 |
|
(put 'ediff-current-diff-face-A 'face-alias 'ediff-current-diff-A) |
920 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
921 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
922 |
(defvar ediff-current-diff-face-A 'ediff-current-diff-face-A |
(defvar ediff-current-diff-face-A 'ediff-current-diff-A |
923 |
"Face for highlighting the selected difference in buffer A. |
"Face for highlighting the selected difference in buffer A. |
924 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
925 |
widget to customize the actual face object `ediff-current-diff-face-A' |
widget to customize the actual face object `ediff-current-diff-A' |
926 |
this variable represents.") |
this variable represents.") |
927 |
(ediff-hide-face 'ediff-current-diff-face-A) |
(ediff-hide-face 'ediff-current-diff-A) |
928 |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
929 |
;; This means that some user customization may be trashed. |
;; This means that some user customization may be trashed. |
930 |
(if (and ediff-xemacs-p |
(if (and ediff-xemacs-p |
931 |
(ediff-has-face-support-p) |
(ediff-has-face-support-p) |
932 |
(not (ediff-color-display-p))) |
(not (ediff-color-display-p))) |
933 |
(copy-face 'modeline 'ediff-current-diff-face-A)) |
(copy-face 'modeline 'ediff-current-diff-A)) |
934 |
|
|
935 |
|
|
936 |
|
|
937 |
(defface ediff-current-diff-face-B |
(defface ediff-current-diff-B |
938 |
(if ediff-emacs-p |
(if ediff-emacs-p |
939 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
940 |
(:foreground "DarkOrchid" :background "Yellow")) |
(:foreground "DarkOrchid" :background "Yellow")) |
948 |
(t (:inverse-video t)))) |
(t (:inverse-video t)))) |
949 |
"Face for highlighting the selected difference in buffer B." |
"Face for highlighting the selected difference in buffer B." |
950 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
951 |
|
;; backward-compatibility alias |
952 |
|
(put 'ediff-current-diff-face-B 'face-alias 'ediff-current-diff-B) |
953 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
954 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
955 |
(defvar ediff-current-diff-face-B 'ediff-current-diff-face-B |
(defvar ediff-current-diff-face-B 'ediff-current-diff-B |
956 |
"Face for highlighting the selected difference in buffer B. |
"Face for highlighting the selected difference in buffer B. |
957 |
this variable. Instead, use the customization |
this variable. Instead, use the customization |
958 |
widget to customize the actual face `ediff-current-diff-face-B' |
widget to customize the actual face `ediff-current-diff-B' |
959 |
this variable represents.") |
this variable represents.") |
960 |
(ediff-hide-face 'ediff-current-diff-face-B) |
(ediff-hide-face 'ediff-current-diff-B) |
961 |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
962 |
;; This means that some user customization may be trashed. |
;; This means that some user customization may be trashed. |
963 |
(if (and ediff-xemacs-p |
(if (and ediff-xemacs-p |
964 |
(ediff-has-face-support-p) |
(ediff-has-face-support-p) |
965 |
(not (ediff-color-display-p))) |
(not (ediff-color-display-p))) |
966 |
(copy-face 'modeline 'ediff-current-diff-face-B)) |
(copy-face 'modeline 'ediff-current-diff-B)) |
967 |
|
|
968 |
|
|
969 |
(defface ediff-current-diff-face-C |
(defface ediff-current-diff-C |
970 |
(if ediff-emacs-p |
(if ediff-emacs-p |
971 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
972 |
(:foreground "Navy" :background "Pink")) |
(:foreground "Navy" :background "Pink")) |
978 |
(t (:inverse-video t)))) |
(t (:inverse-video t)))) |
979 |
"Face for highlighting the selected difference in buffer C." |
"Face for highlighting the selected difference in buffer C." |
980 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
981 |
|
;; backward-compatibility alias |
982 |
|
(put 'ediff-current-diff-face-C 'face-alias 'ediff-current-diff-C) |
983 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
984 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
985 |
(defvar ediff-current-diff-face-C 'ediff-current-diff-face-C |
(defvar ediff-current-diff-face-C 'ediff-current-diff-C |
986 |
"Face for highlighting the selected difference in buffer C. |
"Face for highlighting the selected difference in buffer C. |
987 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
988 |
widget to customize the actual face object `ediff-current-diff-face-C' |
widget to customize the actual face object `ediff-current-diff-C' |
989 |
this variable represents.") |
this variable represents.") |
990 |
(ediff-hide-face 'ediff-current-diff-face-C) |
(ediff-hide-face 'ediff-current-diff-C) |
991 |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
992 |
;; This means that some user customization may be trashed. |
;; This means that some user customization may be trashed. |
993 |
(if (and ediff-xemacs-p |
(if (and ediff-xemacs-p |
994 |
(ediff-has-face-support-p) |
(ediff-has-face-support-p) |
995 |
(not (ediff-color-display-p))) |
(not (ediff-color-display-p))) |
996 |
(copy-face 'modeline 'ediff-current-diff-face-C)) |
(copy-face 'modeline 'ediff-current-diff-C)) |
997 |
|
|
998 |
|
|
999 |
(defface ediff-current-diff-face-Ancestor |
(defface ediff-current-diff-Ancestor |
1000 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1001 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
1002 |
(:foreground "Black" :background "VioletRed")) |
(:foreground "Black" :background "VioletRed")) |
1008 |
(t (:inverse-video t)))) |
(t (:inverse-video t)))) |
1009 |
"Face for highlighting the selected difference in buffer Ancestor." |
"Face for highlighting the selected difference in buffer Ancestor." |
1010 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1011 |
|
;; backward-compatibility alias |
1012 |
|
(put 'ediff-current-diff-face-Ancestor 'face-alias 'ediff-current-diff-Ancestor) |
1013 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1014 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1015 |
(defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor |
(defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor |
1016 |
"Face for highlighting the selected difference in buffer Ancestor. |
"Face for highlighting the selected difference in buffer Ancestor. |
1017 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1018 |
widget to customize the actual face object `ediff-current-diff-face-Ancestor' |
widget to customize the actual face object `ediff-current-diff-Ancestor' |
1019 |
this variable represents.") |
this variable represents.") |
1020 |
(ediff-hide-face 'ediff-current-diff-face-Ancestor) |
(ediff-hide-face 'ediff-current-diff-Ancestor) |
1021 |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
;; Until custom.el for XEmacs starts supporting :inverse-video we do this. |
1022 |
;; This means that some user customization may be trashed. |
;; This means that some user customization may be trashed. |
1023 |
(if (and ediff-xemacs-p |
(if (and ediff-xemacs-p |
1024 |
(ediff-has-face-support-p) |
(ediff-has-face-support-p) |
1025 |
(not (ediff-color-display-p))) |
(not (ediff-color-display-p))) |
1026 |
(copy-face 'modeline 'ediff-current-diff-face-Ancestor)) |
(copy-face 'modeline 'ediff-current-diff-Ancestor)) |
1027 |
|
|
1028 |
|
|
1029 |
(defface ediff-fine-diff-face-A |
(defface ediff-fine-diff-A |
1030 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1031 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
1032 |
(:foreground "Navy" :background "sky blue")) |
(:foreground "Navy" :background "sky blue")) |
1038 |
(t (:underline t :stipple "gray3")))) |
(t (:underline t :stipple "gray3")))) |
1039 |
"Face for highlighting the refinement of the selected diff in buffer A." |
"Face for highlighting the refinement of the selected diff in buffer A." |
1040 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1041 |
|
;; backward-compatibility alias |
1042 |
|
(put 'ediff-fine-diff-face-A 'face-alias 'ediff-fine-diff-A) |
1043 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1044 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1045 |
(defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A |
(defvar ediff-fine-diff-face-A 'ediff-fine-diff-A |
1046 |
"Face for highlighting the fine differences in buffer A. |
"Face for highlighting the fine differences in buffer A. |
1047 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1048 |
widget to customize the actual face object `ediff-fine-diff-face-A' |
widget to customize the actual face object `ediff-fine-diff-A' |
1049 |
this variable represents.") |
this variable represents.") |
1050 |
(ediff-hide-face 'ediff-fine-diff-face-A) |
(ediff-hide-face 'ediff-fine-diff-A) |
1051 |
|
|
1052 |
(defface ediff-fine-diff-face-B |
(defface ediff-fine-diff-B |
1053 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1054 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
1055 |
(:foreground "Black" :background "cyan")) |
(:foreground "Black" :background "cyan")) |
1061 |
(t (:underline t :stipple "gray3")))) |
(t (:underline t :stipple "gray3")))) |
1062 |
"Face for highlighting the refinement of the selected diff in buffer B." |
"Face for highlighting the refinement of the selected diff in buffer B." |
1063 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1064 |
|
;; backward-compatibility alias |
1065 |
|
(put 'ediff-fine-diff-face-B 'face-alias 'ediff-fine-diff-B) |
1066 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1067 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1068 |
(defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B |
(defvar ediff-fine-diff-face-B 'ediff-fine-diff-B |
1069 |
"Face for highlighting the fine differences in buffer B. |
"Face for highlighting the fine differences in buffer B. |
1070 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1071 |
widget to customize the actual face object `ediff-fine-diff-face-B' |
widget to customize the actual face object `ediff-fine-diff-B' |
1072 |
this variable represents.") |
this variable represents.") |
1073 |
(ediff-hide-face 'ediff-fine-diff-face-B) |
(ediff-hide-face 'ediff-fine-diff-B) |
1074 |
|
|
1075 |
(defface ediff-fine-diff-face-C |
(defface ediff-fine-diff-C |
1076 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1077 |
'((((type pc)) |
'((((type pc)) |
1078 |
(:foreground "white" :background "Turquoise")) |
(:foreground "white" :background "Turquoise")) |
1089 |
(t (:underline t :stipple "gray3")))) |
(t (:underline t :stipple "gray3")))) |
1090 |
"Face for highlighting the refinement of the selected diff in buffer C." |
"Face for highlighting the refinement of the selected diff in buffer C." |
1091 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1092 |
|
;; backward-compatibility alias |
1093 |
|
(put 'ediff-fine-diff-face-C 'face-alias 'ediff-fine-diff-C) |
1094 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1095 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1096 |
(defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C |
(defvar ediff-fine-diff-face-C 'ediff-fine-diff-C |
1097 |
"Face for highlighting the fine differences in buffer C. |
"Face for highlighting the fine differences in buffer C. |
1098 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1099 |
widget to customize the actual face object `ediff-fine-diff-face-C' |
widget to customize the actual face object `ediff-fine-diff-C' |
1100 |
this variable represents.") |
this variable represents.") |
1101 |
(ediff-hide-face 'ediff-fine-diff-face-C) |
(ediff-hide-face 'ediff-fine-diff-C) |
1102 |
|
|
1103 |
(defface ediff-fine-diff-face-Ancestor |
(defface ediff-fine-diff-Ancestor |
1104 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1105 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
1106 |
(:foreground "Black" :background "Green")) |
(:foreground "Black" :background "Green")) |
1114 |
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 |
1115 |
ancestor buffer." |
ancestor buffer." |
1116 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1117 |
|
;; backward-compatibility alias |
1118 |
|
(put 'ediff-fine-diff-face-Ancestor 'face-alias 'ediff-fine-diff-Ancestor) |
1119 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1120 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1121 |
(defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor |
(defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor |
1122 |
"Face for highlighting the fine differences in buffer Ancestor. |
"Face for highlighting the fine differences in buffer Ancestor. |
1123 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1124 |
widget to customize the actual face object `ediff-fine-diff-face-Ancestor' |
widget to customize the actual face object `ediff-fine-diff-Ancestor' |
1125 |
this variable represents.") |
this variable represents.") |
1126 |
(ediff-hide-face 'ediff-fine-diff-face-Ancestor) |
(ediff-hide-face 'ediff-fine-diff-Ancestor) |
1127 |
|
|
1128 |
;; Some installs don't have stipple or Stipple. So, try them in turn. |
;; Some installs don't have stipple or Stipple. So, try them in turn. |
1129 |
(defvar stipple-pixmap |
(defvar stipple-pixmap |
1134 |
(locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") |
(locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") |
1135 |
(t "Stipple"))) |
(t "Stipple"))) |
1136 |
|
|
1137 |
(defface ediff-even-diff-face-A |
(defface ediff-even-diff-A |
1138 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1139 |
`((((type pc)) |
`((((type pc)) |
1140 |
(:foreground "green3" :background "light grey")) |
(:foreground "green3" :background "light grey")) |
1151 |
(t (:italic t :stipple ,stipple-pixmap)))) |
(t (:italic t :stipple ,stipple-pixmap)))) |
1152 |
"Face for highlighting even-numbered non-current differences in buffer A." |
"Face for highlighting even-numbered non-current differences in buffer A." |
1153 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1154 |
|
;; backward-compatibility alias |
1155 |
|
(put 'ediff-even-diff-face-A 'face-alias 'ediff-even-diff-A) |
1156 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1157 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1158 |
(defvar ediff-even-diff-face-A 'ediff-even-diff-face-A |
(defvar ediff-even-diff-face-A 'ediff-even-diff-A |
1159 |
"Face for highlighting even-numbered non-current differences in buffer A. |
"Face for highlighting even-numbered non-current differences in buffer A. |
1160 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1161 |
widget to customize the actual face object `ediff-even-diff-face-A' |
widget to customize the actual face object `ediff-even-diff-A' |
1162 |
this variable represents.") |
this variable represents.") |
1163 |
(ediff-hide-face 'ediff-even-diff-face-A) |
(ediff-hide-face 'ediff-even-diff-A) |
1164 |
|
|
1165 |
(defface ediff-even-diff-face-B |
(defface ediff-even-diff-B |
1166 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1167 |
`((((class color) (min-colors 16)) |
`((((class color) (min-colors 16)) |
1168 |
(:foreground "White" :background "Grey")) |
(:foreground "White" :background "Grey")) |
1174 |
(t (:italic t :stipple ,stipple-pixmap)))) |
(t (:italic t :stipple ,stipple-pixmap)))) |
1175 |
"Face for highlighting even-numbered non-current differences in buffer B." |
"Face for highlighting even-numbered non-current differences in buffer B." |
1176 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1177 |
|
;; backward-compatibility alias |
1178 |
|
(put 'ediff-even-diff-face-B 'face-alias 'ediff-even-diff-B) |
1179 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1180 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1181 |
(defvar ediff-even-diff-face-B 'ediff-even-diff-face-B |
(defvar ediff-even-diff-face-B 'ediff-even-diff-B |
1182 |
"Face for highlighting even-numbered non-current differences in buffer B. |
"Face for highlighting even-numbered non-current differences in buffer B. |
1183 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1184 |
widget to customize the actual face object `ediff-even-diff-face-B' |
widget to customize the actual face object `ediff-even-diff-B' |
1185 |
this variable represents.") |
this variable represents.") |
1186 |
(ediff-hide-face 'ediff-even-diff-face-B) |
(ediff-hide-face 'ediff-even-diff-B) |
1187 |
|
|
1188 |
(defface ediff-even-diff-face-C |
(defface ediff-even-diff-C |
1189 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1190 |
`((((type pc)) |
`((((type pc)) |
1191 |
(:foreground "yellow3" :background "light grey")) |
(:foreground "yellow3" :background "light grey")) |
1202 |
(t (:italic t :stipple ,stipple-pixmap)))) |
(t (:italic t :stipple ,stipple-pixmap)))) |
1203 |
"Face for highlighting even-numbered non-current differences in buffer C." |
"Face for highlighting even-numbered non-current differences in buffer C." |
1204 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1205 |
|
;; backward-compatibility alias |
1206 |
|
(put 'ediff-even-diff-face-C 'face-alias 'ediff-even-diff-C) |
1207 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1208 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1209 |
(defvar ediff-even-diff-face-C 'ediff-even-diff-face-C |
(defvar ediff-even-diff-face-C 'ediff-even-diff-C |
1210 |
"Face for highlighting even-numbered non-current differences in buffer C. |
"Face for highlighting even-numbered non-current differences in buffer C. |
1211 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1212 |
widget to customize the actual face object `ediff-even-diff-face-C' |
widget to customize the actual face object `ediff-even-diff-C' |
1213 |
this variable represents.") |
this variable represents.") |
1214 |
(ediff-hide-face 'ediff-even-diff-face-C) |
(ediff-hide-face 'ediff-even-diff-C) |
1215 |
|
|
1216 |
(defface ediff-even-diff-face-Ancestor |
(defface ediff-even-diff-Ancestor |
1217 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1218 |
`((((type pc)) |
`((((type pc)) |
1219 |
(:foreground "cyan3" :background "light grey")) |
(:foreground "cyan3" :background "light grey")) |
1230 |
(t (:italic t :stipple ,stipple-pixmap)))) |
(t (:italic t :stipple ,stipple-pixmap)))) |
1231 |
"Face for highlighting even-numbered non-current differences in the ancestor buffer." |
"Face for highlighting even-numbered non-current differences in the ancestor buffer." |
1232 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1233 |
|
;; backward-compatibility alias |
1234 |
|
(put 'ediff-even-diff-face-Ancestor 'face-alias 'ediff-even-diff-Ancestor) |
1235 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1236 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1237 |
(defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor |
(defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor |
1238 |
"Face for highlighting even-numbered non-current differences in buffer Ancestor. |
"Face for highlighting even-numbered non-current differences in buffer Ancestor. |
1239 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1240 |
widget to customize the actual face object `ediff-even-diff-face-Ancestor' |
widget to customize the actual face object `ediff-even-diff-Ancestor' |
1241 |
this variable represents.") |
this variable represents.") |
1242 |
(ediff-hide-face 'ediff-even-diff-face-Ancestor) |
(ediff-hide-face 'ediff-even-diff-Ancestor) |
1243 |
|
|
1244 |
;; Association between buffer types and even-diff-face symbols |
;; Association between buffer types and even-diff-face symbols |
1245 |
(defconst ediff-even-diff-face-alist |
(defconst ediff-even-diff-face-alist |
1246 |
'((A . ediff-even-diff-face-A) |
'((A . ediff-even-diff-A) |
1247 |
(B . ediff-even-diff-face-B) |
(B . ediff-even-diff-B) |
1248 |
(C . ediff-even-diff-face-C) |
(C . ediff-even-diff-C) |
1249 |
(Ancestor . ediff-even-diff-face-Ancestor))) |
(Ancestor . ediff-even-diff-Ancestor))) |
1250 |
|
|
1251 |
(defface ediff-odd-diff-face-A |
(defface ediff-odd-diff-A |
1252 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1253 |
'((((type pc)) |
'((((type pc)) |
1254 |
(:foreground "green3" :background "gray40")) |
(:foreground "green3" :background "gray40")) |
1263 |
(t (:italic t :stipple "gray1")))) |
(t (:italic t :stipple "gray1")))) |
1264 |
"Face for highlighting odd-numbered non-current differences in buffer A." |
"Face for highlighting odd-numbered non-current differences in buffer A." |
1265 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1266 |
|
;; backward-compatibility alias |
1267 |
|
(put 'ediff-odd-diff-face-A 'face-alias 'ediff-odd-diff-A) |
1268 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1269 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1270 |
(defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A |
(defvar ediff-odd-diff-face-A 'ediff-odd-diff-A |
1271 |
"Face for highlighting odd-numbered non-current differences in buffer A. |
"Face for highlighting odd-numbered non-current differences in buffer A. |
1272 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1273 |
widget to customize the actual face object `ediff-odd-diff-face-A' |
widget to customize the actual face object `ediff-odd-diff-A' |
1274 |
this variable represents.") |
this variable represents.") |
1275 |
(ediff-hide-face 'ediff-odd-diff-face-A) |
(ediff-hide-face 'ediff-odd-diff-A) |
1276 |
|
|
1277 |
|
|
1278 |
(defface ediff-odd-diff-face-B |
(defface ediff-odd-diff-B |
1279 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1280 |
'((((type pc)) |
'((((type pc)) |
1281 |
(:foreground "White" :background "gray40")) |
(:foreground "White" :background "gray40")) |
1290 |
(t (:italic t :stipple "gray1")))) |
(t (:italic t :stipple "gray1")))) |
1291 |
"Face for highlighting odd-numbered non-current differences in buffer B." |
"Face for highlighting odd-numbered non-current differences in buffer B." |
1292 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1293 |
|
;; backward-compatibility alias |
1294 |
|
(put 'ediff-odd-diff-face-B 'face-alias 'ediff-odd-diff-B) |
1295 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1296 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1297 |
(defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B |
(defvar ediff-odd-diff-face-B 'ediff-odd-diff-B |
1298 |
"Face for highlighting odd-numbered non-current differences in buffer B. |
"Face for highlighting odd-numbered non-current differences in buffer B. |
1299 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1300 |
widget to customize the actual face object `ediff-odd-diff-face-B' |
widget to customize the actual face object `ediff-odd-diff-B' |
1301 |
this variable represents.") |
this variable represents.") |
1302 |
(ediff-hide-face 'ediff-odd-diff-face-B) |
(ediff-hide-face 'ediff-odd-diff-B) |
1303 |
|
|
1304 |
(defface ediff-odd-diff-face-C |
(defface ediff-odd-diff-C |
1305 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1306 |
'((((type pc)) |
'((((type pc)) |
1307 |
(:foreground "yellow3" :background "gray40")) |
(:foreground "yellow3" :background "gray40")) |
1316 |
(t (:italic t :stipple "gray1")))) |
(t (:italic t :stipple "gray1")))) |
1317 |
"Face for highlighting odd-numbered non-current differences in buffer C." |
"Face for highlighting odd-numbered non-current differences in buffer C." |
1318 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1319 |
|
;; backward-compatibility alias |
1320 |
|
(put 'ediff-odd-diff-face-C 'face-alias 'ediff-odd-diff-C) |
1321 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1322 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1323 |
(defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C |
(defvar ediff-odd-diff-face-C 'ediff-odd-diff-C |
1324 |
"Face for highlighting odd-numbered non-current differences in buffer C. |
"Face for highlighting odd-numbered non-current differences in buffer C. |
1325 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1326 |
widget to customize the actual face object `ediff-odd-diff-face-C' |
widget to customize the actual face object `ediff-odd-diff-C' |
1327 |
this variable represents.") |
this variable represents.") |
1328 |
(ediff-hide-face 'ediff-odd-diff-face-C) |
(ediff-hide-face 'ediff-odd-diff-C) |
1329 |
|
|
1330 |
(defface ediff-odd-diff-face-Ancestor |
(defface ediff-odd-diff-Ancestor |
1331 |
(if ediff-emacs-p |
(if ediff-emacs-p |
1332 |
'((((class color) (min-colors 16)) |
'((((class color) (min-colors 16)) |
1333 |
(:foreground "cyan3" :background "gray40")) |
(:foreground "cyan3" :background "gray40")) |
1339 |
(t (:italic t :stipple "gray1")))) |
(t (:italic t :stipple "gray1")))) |
1340 |
"Face for highlighting odd-numbered non-current differences in the ancestor buffer." |
"Face for highlighting odd-numbered non-current differences in the ancestor buffer." |
1341 |
:group 'ediff-highlighting) |
:group 'ediff-highlighting) |
1342 |
|
;; backward-compatibility alias |
1343 |
|
(put 'ediff-odd-diff-face-Ancestor 'face-alias 'ediff-odd-diff-Ancestor) |
1344 |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
;; An internal variable. Ediff takes the face from here. When unhighlighting, |
1345 |
;; this variable is set to nil, then again to the appropriate face. |
;; this variable is set to nil, then again to the appropriate face. |
1346 |
(defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor |
(defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor |
1347 |
"Face for highlighting odd-numbered non-current differences in buffer Ancestor. |
"Face for highlighting odd-numbered non-current differences in buffer Ancestor. |
1348 |
DO NOT CHANGE this variable. Instead, use the customization |
DO NOT CHANGE this variable. Instead, use the customization |
1349 |
widget to customize the actual face object `ediff-odd-diff-face-Ancestor' |
widget to customize the actual face object `ediff-odd-diff-Ancestor' |
1350 |
this variable represents.") |
this variable represents.") |
1351 |
(ediff-hide-face 'ediff-odd-diff-face-Ancestor) |
(ediff-hide-face 'ediff-odd-diff-Ancestor) |
1352 |
|
|
1353 |
;; Association between buffer types and odd-diff-face symbols |
;; Association between buffer types and odd-diff-face symbols |
1354 |
(defconst ediff-odd-diff-face-alist |
(defconst ediff-odd-diff-face-alist |
1365 |
(Ancestor . ediff-fine-diff-face-Ancestor))) |
(Ancestor . ediff-fine-diff-face-Ancestor))) |
1366 |
|
|
1367 |
;; Help echo |
;; Help echo |
1368 |
(put 'ediff-fine-diff-face-A 'ediff-help-echo |
(put 'ediff-fine-diff-A 'ediff-help-echo |
1369 |
"A `refinement' of the current difference region") |
"A `refinement' of the current difference region") |
1370 |
(put 'ediff-fine-diff-face-B 'ediff-help-echo |
(put 'ediff-fine-diff-B 'ediff-help-echo |
1371 |
"A `refinement' of the current difference region") |
"A `refinement' of the current difference region") |
1372 |
(put 'ediff-fine-diff-face-C 'ediff-help-echo |
(put 'ediff-fine-diff-C 'ediff-help-echo |
1373 |
"A `refinement' of the current difference region") |
"A `refinement' of the current difference region") |
1374 |
(put 'ediff-fine-diff-face-Ancestor 'ediff-help-echo |
(put 'ediff-fine-diff-Ancestor 'ediff-help-echo |
1375 |
"A `refinement' of the current difference region") |
"A `refinement' of the current difference region") |
1376 |
|
|
1377 |
(add-hook 'ediff-quit-hook 'ediff-cleanup-mess) |
(add-hook 'ediff-quit-hook 'ediff-cleanup-mess) |