Mercurial > emacs

comparison lisp/ediff-init.el @ 63534:02c83ab8178d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432 Remove "-face" suffix from ediff faces 2005-06-17 Miles Bader <miles@gnu.org> * lisp/ediff-init.el (ediff-current-diff-A, ediff-current-diff-B) (ediff-current-diff-C, ediff-current-diff-Ancestor) (ediff-fine-diff-A, ediff-fine-diff-B, ediff-fine-diff-C) (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B) (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A) (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor): Remove "-face" suffix from face names. (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): New backward-compatibility aliases for renamed faces. (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 renamed ediff faces.
author Miles Bader <miles@gnu.org>
date Fri, 17 Jun 2005 05:55:26 +0000
parents 4efad09bd407
children 35df749b5a09 b7da78284d4c
comparison
equal deleted inserted replaced
63533:b7ea6515f1ba 63534:02c83ab8178d
901 (boundp 'facemenu-unlisted-faces)) 901 (boundp 'facemenu-unlisted-faces))
902 (add-to-list 'facemenu-unlisted-faces face))) 902 (add-to-list 'facemenu-unlisted-faces face)))
903 903
904 904
905 905
906 (defface ediff-current-diff-face-A 906 (defface ediff-current-diff-A
907 (if ediff-emacs-p 907 (if ediff-emacs-p
908 '((((class color) (min-colors 16)) 908 '((((class color) (min-colors 16))
909 (:foreground "firebrick" :background "pale green")) 909 (:foreground "firebrick" :background "pale green"))
910 (((class color)) 910 (((class color))
911 (:foreground "blue3" :background "yellow3")) 911 (:foreground "blue3" :background "yellow3"))
913 '((((type tty)) (:foreground "blue3" :background "yellow3")) 913 '((((type tty)) (:foreground "blue3" :background "yellow3"))
914 (((class color)) (:foreground "firebrick" :background "pale green")) 914 (((class color)) (:foreground "firebrick" :background "pale green"))
915 (t (:inverse-video t)))) 915 (t (:inverse-video t))))
916 "Face for highlighting the selected difference in buffer A." 916 "Face for highlighting the selected difference in buffer A."
917 :group 'ediff-highlighting) 917 :group 'ediff-highlighting)
918 ;; backward-compatibility alias
919 (put 'ediff-current-diff-face-A 'face-alias 'ediff-current-diff-A)
918 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 920 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
919 ;; this variable is set to nil, then again to the appropriate face. 921 ;; this variable is set to nil, then again to the appropriate face.
920 (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A 922 (defvar ediff-current-diff-face-A 'ediff-current-diff-A
921 "Face for highlighting the selected difference in buffer A. 923 "Face for highlighting the selected difference in buffer A.
922 DO NOT CHANGE this variable. Instead, use the customization 924 DO NOT CHANGE this variable. Instead, use the customization
923 widget to customize the actual face object `ediff-current-diff-face-A' 925 widget to customize the actual face object `ediff-current-diff-A'
924 this variable represents.") 926 this variable represents.")
925 (ediff-hide-face 'ediff-current-diff-face-A) 927 (ediff-hide-face 'ediff-current-diff-A)
926 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 928 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
927 ;; This means that some user customization may be trashed. 929 ;; This means that some user customization may be trashed.
928 (if (and ediff-xemacs-p 930 (if (and ediff-xemacs-p
929 (ediff-has-face-support-p) 931 (ediff-has-face-support-p)
930 (not (ediff-color-display-p))) 932 (not (ediff-color-display-p)))
931 (copy-face 'modeline 'ediff-current-diff-face-A)) 933 (copy-face 'modeline 'ediff-current-diff-A))
932 934
933 935
934 936
935 (defface ediff-current-diff-face-B 937 (defface ediff-current-diff-B
936 (if ediff-emacs-p 938 (if ediff-emacs-p
937 '((((class color) (min-colors 16)) 939 '((((class color) (min-colors 16))
938 (:foreground "DarkOrchid" :background "Yellow")) 940 (:foreground "DarkOrchid" :background "Yellow"))
939 (((class color)) 941 (((class color))
940 (:foreground "magenta3" :background "yellow3" 942 (:foreground "magenta3" :background "yellow3"
944 :weight bold)) 946 :weight bold))
945 (((class color)) (:foreground "DarkOrchid" :background "Yellow")) 947 (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
946 (t (:inverse-video t)))) 948 (t (:inverse-video t))))
947 "Face for highlighting the selected difference in buffer B." 949 "Face for highlighting the selected difference in buffer B."
948 :group 'ediff-highlighting) 950 :group 'ediff-highlighting)
951 ;; backward-compatibility alias
952 (put 'ediff-current-diff-face-B 'face-alias 'ediff-current-diff-B)
949 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 953 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
950 ;; this variable is set to nil, then again to the appropriate face. 954 ;; this variable is set to nil, then again to the appropriate face.
951 (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B 955 (defvar ediff-current-diff-face-B 'ediff-current-diff-B
952 "Face for highlighting the selected difference in buffer B. 956 "Face for highlighting the selected difference in buffer B.
953 this variable. Instead, use the customization 957 this variable. Instead, use the customization
954 widget to customize the actual face `ediff-current-diff-face-B' 958 widget to customize the actual face `ediff-current-diff-B'
955 this variable represents.") 959 this variable represents.")
956 (ediff-hide-face 'ediff-current-diff-face-B) 960 (ediff-hide-face 'ediff-current-diff-B)
957 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 961 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
958 ;; This means that some user customization may be trashed. 962 ;; This means that some user customization may be trashed.
959 (if (and ediff-xemacs-p 963 (if (and ediff-xemacs-p
960 (ediff-has-face-support-p) 964 (ediff-has-face-support-p)
961 (not (ediff-color-display-p))) 965 (not (ediff-color-display-p)))
962 (copy-face 'modeline 'ediff-current-diff-face-B)) 966 (copy-face 'modeline 'ediff-current-diff-B))
963 967
964 968
965 (defface ediff-current-diff-face-C 969 (defface ediff-current-diff-C
966 (if ediff-emacs-p 970 (if ediff-emacs-p
967 '((((class color) (min-colors 16)) 971 '((((class color) (min-colors 16))
968 (:foreground "Navy" :background "Pink")) 972 (:foreground "Navy" :background "Pink"))
969 (((class color)) 973 (((class color))
970 (:foreground "cyan3" :background "yellow3" :weight bold)) 974 (:foreground "cyan3" :background "yellow3" :weight bold))
972 '((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) 976 '((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold))
973 (((class color)) (:foreground "Navy" :background "Pink")) 977 (((class color)) (:foreground "Navy" :background "Pink"))
974 (t (:inverse-video t)))) 978 (t (:inverse-video t))))
975 "Face for highlighting the selected difference in buffer C." 979 "Face for highlighting the selected difference in buffer C."
976 :group 'ediff-highlighting) 980 :group 'ediff-highlighting)
981 ;; backward-compatibility alias
982 (put 'ediff-current-diff-face-C 'face-alias 'ediff-current-diff-C)
977 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 983 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
978 ;; this variable is set to nil, then again to the appropriate face. 984 ;; this variable is set to nil, then again to the appropriate face.
979 (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C 985 (defvar ediff-current-diff-face-C 'ediff-current-diff-C
980 "Face for highlighting the selected difference in buffer C. 986 "Face for highlighting the selected difference in buffer C.
981 DO NOT CHANGE this variable. Instead, use the customization 987 DO NOT CHANGE this variable. Instead, use the customization
982 widget to customize the actual face object `ediff-current-diff-face-C' 988 widget to customize the actual face object `ediff-current-diff-C'
983 this variable represents.") 989 this variable represents.")
984 (ediff-hide-face 'ediff-current-diff-face-C) 990 (ediff-hide-face 'ediff-current-diff-C)
985 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 991 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
986 ;; This means that some user customization may be trashed. 992 ;; This means that some user customization may be trashed.
987 (if (and ediff-xemacs-p 993 (if (and ediff-xemacs-p
988 (ediff-has-face-support-p) 994 (ediff-has-face-support-p)
989 (not (ediff-color-display-p))) 995 (not (ediff-color-display-p)))
990 (copy-face 'modeline 'ediff-current-diff-face-C)) 996 (copy-face 'modeline 'ediff-current-diff-C))
991 997
992 998
993 (defface ediff-current-diff-face-Ancestor 999 (defface ediff-current-diff-Ancestor
994 (if ediff-emacs-p 1000 (if ediff-emacs-p
995 '((((class color) (min-colors 16)) 1001 '((((class color) (min-colors 16))
996 (:foreground "Black" :background "VioletRed")) 1002 (:foreground "Black" :background "VioletRed"))
997 (((class color)) 1003 (((class color))
998 (:foreground "black" :background "magenta3")) 1004 (:foreground "black" :background "magenta3"))
1000 '((((type tty)) (:foreground "black" :background "magenta3")) 1006 '((((type tty)) (:foreground "black" :background "magenta3"))
1001 (((class color)) (:foreground "Black" :background "VioletRed")) 1007 (((class color)) (:foreground "Black" :background "VioletRed"))
1002 (t (:inverse-video t)))) 1008 (t (:inverse-video t))))
1003 "Face for highlighting the selected difference in buffer Ancestor." 1009 "Face for highlighting the selected difference in buffer Ancestor."
1004 :group 'ediff-highlighting) 1010 :group 'ediff-highlighting)
1011 ;; backward-compatibility alias
1012 (put 'ediff-current-diff-face-Ancestor 'face-alias 'ediff-current-diff-Ancestor)
1005 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1013 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1006 ;; this variable is set to nil, then again to the appropriate face. 1014 ;; this variable is set to nil, then again to the appropriate face.
1007 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor 1015 (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor
1008 "Face for highlighting the selected difference in buffer Ancestor. 1016 "Face for highlighting the selected difference in buffer Ancestor.
1009 DO NOT CHANGE this variable. Instead, use the customization 1017 DO NOT CHANGE this variable. Instead, use the customization
1010 widget to customize the actual face object `ediff-current-diff-face-Ancestor' 1018 widget to customize the actual face object `ediff-current-diff-Ancestor'
1011 this variable represents.") 1019 this variable represents.")
1012 (ediff-hide-face 'ediff-current-diff-face-Ancestor) 1020 (ediff-hide-face 'ediff-current-diff-Ancestor)
1013 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. 1021 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
1014 ;; This means that some user customization may be trashed. 1022 ;; This means that some user customization may be trashed.
1015 (if (and ediff-xemacs-p 1023 (if (and ediff-xemacs-p
1016 (ediff-has-face-support-p) 1024 (ediff-has-face-support-p)
1017 (not (ediff-color-display-p))) 1025 (not (ediff-color-display-p)))
1018 (copy-face 'modeline 'ediff-current-diff-face-Ancestor)) 1026 (copy-face 'modeline 'ediff-current-diff-Ancestor))
1019 1027
1020 1028
1021 (defface ediff-fine-diff-face-A 1029 (defface ediff-fine-diff-A
1022 (if ediff-emacs-p 1030 (if ediff-emacs-p
1023 '((((class color) (min-colors 16)) 1031 '((((class color) (min-colors 16))
1024 (:foreground "Navy" :background "sky blue")) 1032 (:foreground "Navy" :background "sky blue"))
1025 (((class color)) 1033 (((class color))
1026 (:foreground "white" :background "sky blue" :weight bold)) 1034 (:foreground "white" :background "sky blue" :weight bold))
1028 '((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) 1036 '((((type tty)) (:foreground "white" :background "sky blue" :weight bold))
1029 (((class color)) (:foreground "Navy" :background "sky blue")) 1037 (((class color)) (:foreground "Navy" :background "sky blue"))
1030 (t (:underline t :stipple "gray3")))) 1038 (t (:underline t :stipple "gray3"))))
1031 "Face for highlighting the refinement of the selected diff in buffer A." 1039 "Face for highlighting the refinement of the selected diff in buffer A."
1032 :group 'ediff-highlighting) 1040 :group 'ediff-highlighting)
1041 ;; backward-compatibility alias
1042 (put 'ediff-fine-diff-face-A 'face-alias 'ediff-fine-diff-A)
1033 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1043 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1034 ;; this variable is set to nil, then again to the appropriate face. 1044 ;; this variable is set to nil, then again to the appropriate face.
1035 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A 1045 (defvar ediff-fine-diff-face-A 'ediff-fine-diff-A
1036 "Face for highlighting the fine differences in buffer A. 1046 "Face for highlighting the fine differences in buffer A.
1037 DO NOT CHANGE this variable. Instead, use the customization 1047 DO NOT CHANGE this variable. Instead, use the customization
1038 widget to customize the actual face object `ediff-fine-diff-face-A' 1048 widget to customize the actual face object `ediff-fine-diff-A'
1039 this variable represents.") 1049 this variable represents.")
1040 (ediff-hide-face 'ediff-fine-diff-face-A) 1050 (ediff-hide-face 'ediff-fine-diff-A)
1041 1051
1042 (defface ediff-fine-diff-face-B 1052 (defface ediff-fine-diff-B
1043 (if ediff-emacs-p 1053 (if ediff-emacs-p
1044 '((((class color) (min-colors 16)) 1054 '((((class color) (min-colors 16))
1045 (:foreground "Black" :background "cyan")) 1055 (:foreground "Black" :background "cyan"))
1046 (((class color)) 1056 (((class color))
1047 (:foreground "magenta3" :background "cyan3")) 1057 (:foreground "magenta3" :background "cyan3"))
1049 '((((type tty)) (:foreground "magenta3" :background "cyan3")) 1059 '((((type tty)) (:foreground "magenta3" :background "cyan3"))
1050 (((class color)) (:foreground "Black" :background "cyan")) 1060 (((class color)) (:foreground "Black" :background "cyan"))
1051 (t (:underline t :stipple "gray3")))) 1061 (t (:underline t :stipple "gray3"))))
1052 "Face for highlighting the refinement of the selected diff in buffer B." 1062 "Face for highlighting the refinement of the selected diff in buffer B."
1053 :group 'ediff-highlighting) 1063 :group 'ediff-highlighting)
1064 ;; backward-compatibility alias
1065 (put 'ediff-fine-diff-face-B 'face-alias 'ediff-fine-diff-B)
1054 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1066 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1055 ;; this variable is set to nil, then again to the appropriate face. 1067 ;; this variable is set to nil, then again to the appropriate face.
1056 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B 1068 (defvar ediff-fine-diff-face-B 'ediff-fine-diff-B
1057 "Face for highlighting the fine differences in buffer B. 1069 "Face for highlighting the fine differences in buffer B.
1058 DO NOT CHANGE this variable. Instead, use the customization 1070 DO NOT CHANGE this variable. Instead, use the customization
1059 widget to customize the actual face object `ediff-fine-diff-face-B' 1071 widget to customize the actual face object `ediff-fine-diff-B'
1060 this variable represents.") 1072 this variable represents.")
1061 (ediff-hide-face 'ediff-fine-diff-face-B) 1073 (ediff-hide-face 'ediff-fine-diff-B)
1062 1074
1063 (defface ediff-fine-diff-face-C 1075 (defface ediff-fine-diff-C
1064 (if ediff-emacs-p 1076 (if ediff-emacs-p
1065 '((((type pc)) 1077 '((((type pc))
1066 (:foreground "white" :background "Turquoise")) 1078 (:foreground "white" :background "Turquoise"))
1067 (((class color) (min-colors 16)) 1079 (((class color) (min-colors 16))
1068 (:foreground "Black" :background "Turquoise")) 1080 (:foreground "Black" :background "Turquoise"))
1075 (((type pc)) (:foreground "white" :background "Turquoise")) 1087 (((type pc)) (:foreground "white" :background "Turquoise"))
1076 (((class color)) (:foreground "Black" :background "Turquoise")) 1088 (((class color)) (:foreground "Black" :background "Turquoise"))
1077 (t (:underline t :stipple "gray3")))) 1089 (t (:underline t :stipple "gray3"))))
1078 "Face for highlighting the refinement of the selected diff in buffer C." 1090 "Face for highlighting the refinement of the selected diff in buffer C."
1079 :group 'ediff-highlighting) 1091 :group 'ediff-highlighting)
1092 ;; backward-compatibility alias
1093 (put 'ediff-fine-diff-face-C 'face-alias 'ediff-fine-diff-C)
1080 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1094 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1081 ;; this variable is set to nil, then again to the appropriate face. 1095 ;; this variable is set to nil, then again to the appropriate face.
1082 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C 1096 (defvar ediff-fine-diff-face-C 'ediff-fine-diff-C
1083 "Face for highlighting the fine differences in buffer C. 1097 "Face for highlighting the fine differences in buffer C.
1084 DO NOT CHANGE this variable. Instead, use the customization 1098 DO NOT CHANGE this variable. Instead, use the customization
1085 widget to customize the actual face object `ediff-fine-diff-face-C' 1099 widget to customize the actual face object `ediff-fine-diff-C'
1086 this variable represents.") 1100 this variable represents.")
1087 (ediff-hide-face 'ediff-fine-diff-face-C) 1101 (ediff-hide-face 'ediff-fine-diff-C)
1088 1102
1089 (defface ediff-fine-diff-face-Ancestor 1103 (defface ediff-fine-diff-Ancestor
1090 (if ediff-emacs-p 1104 (if ediff-emacs-p
1091 '((((class color) (min-colors 16)) 1105 '((((class color) (min-colors 16))
1092 (:foreground "Black" :background "Green")) 1106 (:foreground "Black" :background "Green"))
1093 (((class color)) 1107 (((class color))
1094 (:foreground "red3" :background "green")) 1108 (:foreground "red3" :background "green"))
1098 (t (:underline t :stipple "gray3")))) 1112 (t (:underline t :stipple "gray3"))))
1099 "Face for highlighting the refinement of the selected diff in the ancestor buffer. 1113 "Face for highlighting the refinement of the selected diff in the ancestor buffer.
1100 At present, this face is not used and no fine differences are computed for the 1114 At present, this face is not used and no fine differences are computed for the
1101 ancestor buffer." 1115 ancestor buffer."
1102 :group 'ediff-highlighting) 1116 :group 'ediff-highlighting)
1117 ;; backward-compatibility alias
1118 (put 'ediff-fine-diff-face-Ancestor 'face-alias 'ediff-fine-diff-Ancestor)
1103 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1119 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1104 ;; this variable is set to nil, then again to the appropriate face. 1120 ;; this variable is set to nil, then again to the appropriate face.
1105 (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor 1121 (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor
1106 "Face for highlighting the fine differences in buffer Ancestor. 1122 "Face for highlighting the fine differences in buffer Ancestor.
1107 DO NOT CHANGE this variable. Instead, use the customization 1123 DO NOT CHANGE this variable. Instead, use the customization
1108 widget to customize the actual face object `ediff-fine-diff-face-Ancestor' 1124 widget to customize the actual face object `ediff-fine-diff-Ancestor'
1109 this variable represents.") 1125 this variable represents.")
1110 (ediff-hide-face 'ediff-fine-diff-face-Ancestor) 1126 (ediff-hide-face 'ediff-fine-diff-Ancestor)
1111 1127
1112 ;; Some installs don't have stipple or Stipple. So, try them in turn. 1128 ;; Some installs don't have stipple or Stipple. So, try them in turn.
1113 (defvar stipple-pixmap 1129 (defvar stipple-pixmap
1114 (cond ((not (ediff-has-face-support-p)) nil) 1130 (cond ((not (ediff-has-face-support-p)) nil)
1115 ((and (boundp 'x-bitmap-file-path) 1131 ((and (boundp 'x-bitmap-file-path)
1116 (locate-library "stipple" t x-bitmap-file-path)) "stipple") 1132 (locate-library "stipple" t x-bitmap-file-path)) "stipple")
1117 ((and (boundp 'mswindowsx-bitmap-file-path) 1133 ((and (boundp 'mswindowsx-bitmap-file-path)
1118 (locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") 1134 (locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple")
1119 (t "Stipple"))) 1135 (t "Stipple")))
1120 1136
1121 (defface ediff-even-diff-face-A 1137 (defface ediff-even-diff-A
1122 (if ediff-emacs-p 1138 (if ediff-emacs-p
1123 `((((type pc)) 1139 `((((type pc))
1124 (:foreground "green3" :background "light grey")) 1140 (:foreground "green3" :background "light grey"))
1125 (((class color) (min-colors 16)) 1141 (((class color) (min-colors 16))
1126 (:foreground "Black" :background "light grey")) 1142 (:foreground "Black" :background "light grey"))
1133 (((type pc)) (:foreground "green3" :background "light grey")) 1149 (((type pc)) (:foreground "green3" :background "light grey"))
1134 (((class color)) (:foreground "Black" :background "light grey")) 1150 (((class color)) (:foreground "Black" :background "light grey"))
1135 (t (:italic t :stipple ,stipple-pixmap)))) 1151 (t (:italic t :stipple ,stipple-pixmap))))
1136 "Face for highlighting even-numbered non-current differences in buffer A." 1152 "Face for highlighting even-numbered non-current differences in buffer A."
1137 :group 'ediff-highlighting) 1153 :group 'ediff-highlighting)
1154 ;; backward-compatibility alias
1155 (put 'ediff-even-diff-face-A 'face-alias 'ediff-even-diff-A)
1138 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1156 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1139 ;; this variable is set to nil, then again to the appropriate face. 1157 ;; this variable is set to nil, then again to the appropriate face.
1140 (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A 1158 (defvar ediff-even-diff-face-A 'ediff-even-diff-A
1141 "Face for highlighting even-numbered non-current differences in buffer A. 1159 "Face for highlighting even-numbered non-current differences in buffer A.
1142 DO NOT CHANGE this variable. Instead, use the customization 1160 DO NOT CHANGE this variable. Instead, use the customization
1143 widget to customize the actual face object `ediff-even-diff-face-A' 1161 widget to customize the actual face object `ediff-even-diff-A'
1144 this variable represents.") 1162 this variable represents.")
1145 (ediff-hide-face 'ediff-even-diff-face-A) 1163 (ediff-hide-face 'ediff-even-diff-A)
1146 1164
1147 (defface ediff-even-diff-face-B 1165 (defface ediff-even-diff-B
1148 (if ediff-emacs-p 1166 (if ediff-emacs-p
1149 `((((class color) (min-colors 16)) 1167 `((((class color) (min-colors 16))
1150 (:foreground "White" :background "Grey")) 1168 (:foreground "White" :background "Grey"))
1151 (((class color)) 1169 (((class color))
1152 (:foreground "blue3" :background "Grey" :weight bold)) 1170 (:foreground "blue3" :background "Grey" :weight bold))
1154 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) 1172 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold))
1155 (((class color)) (:foreground "White" :background "Grey")) 1173 (((class color)) (:foreground "White" :background "Grey"))
1156 (t (:italic t :stipple ,stipple-pixmap)))) 1174 (t (:italic t :stipple ,stipple-pixmap))))
1157 "Face for highlighting even-numbered non-current differences in buffer B." 1175 "Face for highlighting even-numbered non-current differences in buffer B."
1158 :group 'ediff-highlighting) 1176 :group 'ediff-highlighting)
1177 ;; backward-compatibility alias
1178 (put 'ediff-even-diff-face-B 'face-alias 'ediff-even-diff-B)
1159 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1179 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1160 ;; this variable is set to nil, then again to the appropriate face. 1180 ;; this variable is set to nil, then again to the appropriate face.
1161 (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B 1181 (defvar ediff-even-diff-face-B 'ediff-even-diff-B
1162 "Face for highlighting even-numbered non-current differences in buffer B. 1182 "Face for highlighting even-numbered non-current differences in buffer B.
1163 DO NOT CHANGE this variable. Instead, use the customization 1183 DO NOT CHANGE this variable. Instead, use the customization
1164 widget to customize the actual face object `ediff-even-diff-face-B' 1184 widget to customize the actual face object `ediff-even-diff-B'
1165 this variable represents.") 1185 this variable represents.")
1166 (ediff-hide-face 'ediff-even-diff-face-B) 1186 (ediff-hide-face 'ediff-even-diff-B)
1167 1187
1168 (defface ediff-even-diff-face-C 1188 (defface ediff-even-diff-C
1169 (if ediff-emacs-p 1189 (if ediff-emacs-p
1170 `((((type pc)) 1190 `((((type pc))
1171 (:foreground "yellow3" :background "light grey")) 1191 (:foreground "yellow3" :background "light grey"))
1172 (((class color) (min-colors 16)) 1192 (((class color) (min-colors 16))
1173 (:foreground "Black" :background "light grey")) 1193 (:foreground "Black" :background "light grey"))
1180 (((type pc)) (:foreground "yellow3" :background "light grey")) 1200 (((type pc)) (:foreground "yellow3" :background "light grey"))
1181 (((class color)) (:foreground "Black" :background "light grey")) 1201 (((class color)) (:foreground "Black" :background "light grey"))
1182 (t (:italic t :stipple ,stipple-pixmap)))) 1202 (t (:italic t :stipple ,stipple-pixmap))))
1183 "Face for highlighting even-numbered non-current differences in buffer C." 1203 "Face for highlighting even-numbered non-current differences in buffer C."
1184 :group 'ediff-highlighting) 1204 :group 'ediff-highlighting)
1205 ;; backward-compatibility alias
1206 (put 'ediff-even-diff-face-C 'face-alias 'ediff-even-diff-C)
1185 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1207 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1186 ;; this variable is set to nil, then again to the appropriate face. 1208 ;; this variable is set to nil, then again to the appropriate face.
1187 (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C 1209 (defvar ediff-even-diff-face-C 'ediff-even-diff-C
1188 "Face for highlighting even-numbered non-current differences in buffer C. 1210 "Face for highlighting even-numbered non-current differences in buffer C.
1189 DO NOT CHANGE this variable. Instead, use the customization 1211 DO NOT CHANGE this variable. Instead, use the customization
1190 widget to customize the actual face object `ediff-even-diff-face-C' 1212 widget to customize the actual face object `ediff-even-diff-C'
1191 this variable represents.") 1213 this variable represents.")
1192 (ediff-hide-face 'ediff-even-diff-face-C) 1214 (ediff-hide-face 'ediff-even-diff-C)
1193 1215
1194 (defface ediff-even-diff-face-Ancestor 1216 (defface ediff-even-diff-Ancestor
1195 (if ediff-emacs-p 1217 (if ediff-emacs-p
1196 `((((type pc)) 1218 `((((type pc))
1197 (:foreground "cyan3" :background "light grey")) 1219 (:foreground "cyan3" :background "light grey"))
1198 (((class color) (min-colors 16)) 1220 (((class color) (min-colors 16))
1199 (:foreground "White" :background "Grey")) 1221 (:foreground "White" :background "Grey"))
1206 (((type pc)) (:foreground "cyan3" :background "light grey")) 1228 (((type pc)) (:foreground "cyan3" :background "light grey"))
1207 (((class color)) (:foreground "White" :background "Grey")) 1229 (((class color)) (:foreground "White" :background "Grey"))
1208 (t (:italic t :stipple ,stipple-pixmap)))) 1230 (t (:italic t :stipple ,stipple-pixmap))))
1209 "Face for highlighting even-numbered non-current differences in the ancestor buffer." 1231 "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1210 :group 'ediff-highlighting) 1232 :group 'ediff-highlighting)
1233 ;; backward-compatibility alias
1234 (put 'ediff-even-diff-face-Ancestor 'face-alias 'ediff-even-diff-Ancestor)
1211 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1235 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1212 ;; this variable is set to nil, then again to the appropriate face. 1236 ;; this variable is set to nil, then again to the appropriate face.
1213 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor 1237 (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor
1214 "Face for highlighting even-numbered non-current differences in buffer Ancestor. 1238 "Face for highlighting even-numbered non-current differences in buffer Ancestor.
1215 DO NOT CHANGE this variable. Instead, use the customization 1239 DO NOT CHANGE this variable. Instead, use the customization
1216 widget to customize the actual face object `ediff-even-diff-face-Ancestor' 1240 widget to customize the actual face object `ediff-even-diff-Ancestor'
1217 this variable represents.") 1241 this variable represents.")
1218 (ediff-hide-face 'ediff-even-diff-face-Ancestor) 1242 (ediff-hide-face 'ediff-even-diff-Ancestor)
1219 1243
1220 ;; Association between buffer types and even-diff-face symbols 1244 ;; Association between buffer types and even-diff-face symbols
1221 (defconst ediff-even-diff-face-alist 1245 (defconst ediff-even-diff-face-alist
1222 '((A . ediff-even-diff-face-A) 1246 '((A . ediff-even-diff-A)
1223 (B . ediff-even-diff-face-B) 1247 (B . ediff-even-diff-B)
1224 (C . ediff-even-diff-face-C) 1248 (C . ediff-even-diff-C)
1225 (Ancestor . ediff-even-diff-face-Ancestor))) 1249 (Ancestor . ediff-even-diff-Ancestor)))
1226 1250
1227 (defface ediff-odd-diff-face-A 1251 (defface ediff-odd-diff-A
1228 (if ediff-emacs-p 1252 (if ediff-emacs-p
1229 '((((type pc)) 1253 '((((type pc))
1230 (:foreground "green3" :background "gray40")) 1254 (:foreground "green3" :background "gray40"))
1231 (((class color) (min-colors 16)) 1255 (((class color) (min-colors 16))
1232 (:foreground "White" :background "Grey")) 1256 (:foreground "White" :background "Grey"))
1237 (((type pc)) (:foreground "green3" :background "gray40")) 1261 (((type pc)) (:foreground "green3" :background "gray40"))
1238 (((class color)) (:foreground "White" :background "Grey")) 1262 (((class color)) (:foreground "White" :background "Grey"))
1239 (t (:italic t :stipple "gray1")))) 1263 (t (:italic t :stipple "gray1"))))
1240 "Face for highlighting odd-numbered non-current differences in buffer A." 1264 "Face for highlighting odd-numbered non-current differences in buffer A."
1241 :group 'ediff-highlighting) 1265 :group 'ediff-highlighting)
1266 ;; backward-compatibility alias
1267 (put 'ediff-odd-diff-face-A 'face-alias 'ediff-odd-diff-A)
1242 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1268 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1243 ;; this variable is set to nil, then again to the appropriate face. 1269 ;; this variable is set to nil, then again to the appropriate face.
1244 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A 1270 (defvar ediff-odd-diff-face-A 'ediff-odd-diff-A
1245 "Face for highlighting odd-numbered non-current differences in buffer A. 1271 "Face for highlighting odd-numbered non-current differences in buffer A.
1246 DO NOT CHANGE this variable. Instead, use the customization 1272 DO NOT CHANGE this variable. Instead, use the customization
1247 widget to customize the actual face object `ediff-odd-diff-face-A' 1273 widget to customize the actual face object `ediff-odd-diff-A'
1248 this variable represents.") 1274 this variable represents.")
1249 (ediff-hide-face 'ediff-odd-diff-face-A) 1275 (ediff-hide-face 'ediff-odd-diff-A)
1250 1276
1251 1277
1252 (defface ediff-odd-diff-face-B 1278 (defface ediff-odd-diff-B
1253 (if ediff-emacs-p 1279 (if ediff-emacs-p
1254 '((((type pc)) 1280 '((((type pc))
1255 (:foreground "White" :background "gray40")) 1281 (:foreground "White" :background "gray40"))
1256 (((class color) (min-colors 16)) 1282 (((class color) (min-colors 16))
1257 (:foreground "Black" :background "light grey")) 1283 (:foreground "Black" :background "light grey"))
1262 (((type pc)) (:foreground "White" :background "gray40")) 1288 (((type pc)) (:foreground "White" :background "gray40"))
1263 (((class color)) (:foreground "Black" :background "light grey")) 1289 (((class color)) (:foreground "Black" :background "light grey"))
1264 (t (:italic t :stipple "gray1")))) 1290 (t (:italic t :stipple "gray1"))))
1265 "Face for highlighting odd-numbered non-current differences in buffer B." 1291 "Face for highlighting odd-numbered non-current differences in buffer B."
1266 :group 'ediff-highlighting) 1292 :group 'ediff-highlighting)
1293 ;; backward-compatibility alias
1294 (put 'ediff-odd-diff-face-B 'face-alias 'ediff-odd-diff-B)
1267 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1295 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1268 ;; this variable is set to nil, then again to the appropriate face. 1296 ;; this variable is set to nil, then again to the appropriate face.
1269 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B 1297 (defvar ediff-odd-diff-face-B 'ediff-odd-diff-B
1270 "Face for highlighting odd-numbered non-current differences in buffer B. 1298 "Face for highlighting odd-numbered non-current differences in buffer B.
1271 DO NOT CHANGE this variable. Instead, use the customization 1299 DO NOT CHANGE this variable. Instead, use the customization
1272 widget to customize the actual face object `ediff-odd-diff-face-B' 1300 widget to customize the actual face object `ediff-odd-diff-B'
1273 this variable represents.") 1301 this variable represents.")
1274 (ediff-hide-face 'ediff-odd-diff-face-B) 1302 (ediff-hide-face 'ediff-odd-diff-B)
1275 1303
1276 (defface ediff-odd-diff-face-C 1304 (defface ediff-odd-diff-C
1277 (if ediff-emacs-p 1305 (if ediff-emacs-p
1278 '((((type pc)) 1306 '((((type pc))
1279 (:foreground "yellow3" :background "gray40")) 1307 (:foreground "yellow3" :background "gray40"))
1280 (((class color) (min-colors 16)) 1308 (((class color) (min-colors 16))
1281 (:foreground "White" :background "Grey")) 1309 (:foreground "White" :background "Grey"))
1286 (((type pc)) (:foreground "yellow3" :background "gray40")) 1314 (((type pc)) (:foreground "yellow3" :background "gray40"))
1287 (((class color)) (:foreground "White" :background "Grey")) 1315 (((class color)) (:foreground "White" :background "Grey"))
1288 (t (:italic t :stipple "gray1")))) 1316 (t (:italic t :stipple "gray1"))))
1289 "Face for highlighting odd-numbered non-current differences in buffer C." 1317 "Face for highlighting odd-numbered non-current differences in buffer C."
1290 :group 'ediff-highlighting) 1318 :group 'ediff-highlighting)
1319 ;; backward-compatibility alias
1320 (put 'ediff-odd-diff-face-C 'face-alias 'ediff-odd-diff-C)
1291 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1321 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1292 ;; this variable is set to nil, then again to the appropriate face. 1322 ;; this variable is set to nil, then again to the appropriate face.
1293 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C 1323 (defvar ediff-odd-diff-face-C 'ediff-odd-diff-C
1294 "Face for highlighting odd-numbered non-current differences in buffer C. 1324 "Face for highlighting odd-numbered non-current differences in buffer C.
1295 DO NOT CHANGE this variable. Instead, use the customization 1325 DO NOT CHANGE this variable. Instead, use the customization
1296 widget to customize the actual face object `ediff-odd-diff-face-C' 1326 widget to customize the actual face object `ediff-odd-diff-C'
1297 this variable represents.") 1327 this variable represents.")
1298 (ediff-hide-face 'ediff-odd-diff-face-C) 1328 (ediff-hide-face 'ediff-odd-diff-C)
1299 1329
1300 (defface ediff-odd-diff-face-Ancestor 1330 (defface ediff-odd-diff-Ancestor
1301 (if ediff-emacs-p 1331 (if ediff-emacs-p
1302 '((((class color) (min-colors 16)) 1332 '((((class color) (min-colors 16))
1303 (:foreground "cyan3" :background "gray40")) 1333 (:foreground "cyan3" :background "gray40"))
1304 (((class color)) 1334 (((class color))
1305 (:foreground "green3" :background "black" :weight bold)) 1335 (:foreground "green3" :background "black" :weight bold))
1307 '((((type tty)) (:foreground "green3" :background "black" :weight bold)) 1337 '((((type tty)) (:foreground "green3" :background "black" :weight bold))
1308 (((class color)) (:foreground "cyan3" :background "gray40")) 1338 (((class color)) (:foreground "cyan3" :background "gray40"))
1309 (t (:italic t :stipple "gray1")))) 1339 (t (:italic t :stipple "gray1"))))
1310 "Face for highlighting odd-numbered non-current differences in the ancestor buffer." 1340 "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1311 :group 'ediff-highlighting) 1341 :group 'ediff-highlighting)
1342 ;; backward-compatibility alias
1343 (put 'ediff-odd-diff-face-Ancestor 'face-alias 'ediff-odd-diff-Ancestor)
1312 ;; An internal variable. Ediff takes the face from here. When unhighlighting, 1344 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1313 ;; this variable is set to nil, then again to the appropriate face. 1345 ;; this variable is set to nil, then again to the appropriate face.
1314 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor 1346 (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor
1315 "Face for highlighting odd-numbered non-current differences in buffer Ancestor. 1347 "Face for highlighting odd-numbered non-current differences in buffer Ancestor.
1316 DO NOT CHANGE this variable. Instead, use the customization 1348 DO NOT CHANGE this variable. Instead, use the customization
1317 widget to customize the actual face object `ediff-odd-diff-face-Ancestor' 1349 widget to customize the actual face object `ediff-odd-diff-Ancestor'
1318 this variable represents.") 1350 this variable represents.")
1319 (ediff-hide-face 'ediff-odd-diff-face-Ancestor) 1351 (ediff-hide-face 'ediff-odd-diff-Ancestor)
1320 1352
1321 ;; Association between buffer types and odd-diff-face symbols 1353 ;; Association between buffer types and odd-diff-face symbols
1322 (defconst ediff-odd-diff-face-alist 1354 (defconst ediff-odd-diff-face-alist
1323 '((A . ediff-odd-diff-face-A) 1355 '((A . ediff-odd-diff-face-A)
1324 (B . ediff-odd-diff-face-B) 1356 (B . ediff-odd-diff-face-B)
1331 (B . ediff-fine-diff-face-B) 1363 (B . ediff-fine-diff-face-B)
1332 (C . ediff-fine-diff-face-C) 1364 (C . ediff-fine-diff-face-C)
1333 (Ancestor . ediff-fine-diff-face-Ancestor))) 1365 (Ancestor . ediff-fine-diff-face-Ancestor)))
1334 1366
1335 ;; Help echo 1367 ;; Help echo
1336 (put 'ediff-fine-diff-face-A 'ediff-help-echo 1368 (put 'ediff-fine-diff-A 'ediff-help-echo
1337 "A `refinement' of the current difference region") 1369 "A `refinement' of the current difference region")
1338 (put 'ediff-fine-diff-face-B 'ediff-help-echo 1370 (put 'ediff-fine-diff-B 'ediff-help-echo
1339 "A `refinement' of the current difference region") 1371 "A `refinement' of the current difference region")
1340 (put 'ediff-fine-diff-face-C 'ediff-help-echo 1372 (put 'ediff-fine-diff-C 'ediff-help-echo
1341 "A `refinement' of the current difference region") 1373 "A `refinement' of the current difference region")
1342 (put 'ediff-fine-diff-face-Ancestor 'ediff-help-echo 1374 (put 'ediff-fine-diff-Ancestor 'ediff-help-echo
1343 "A `refinement' of the current difference region") 1375 "A `refinement' of the current difference region")
1344 1376
1345 (add-hook 'ediff-quit-hook 'ediff-cleanup-mess) 1377 (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
1346 (add-hook 'ediff-suspend-hook 'ediff-default-suspend-function) 1378 (add-hook 'ediff-suspend-hook 'ediff-default-suspend-function)
1347 1379