/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.62.6.1 by handa, Fri Apr 16 12:49:49 2004 UTC revision 1.62.6.2 by miles, Tue Sep 21 09:34:09 2004 UTC
# Line 902  to temp files when Ediff needs to find f Line 902  to temp files when Ediff needs to find f
902    
903    
904  (defface ediff-current-diff-face-A  (defface ediff-current-diff-face-A
905    '((((type tty))    (:foreground "blue3" :background "yellow3"))    (if ediff-emacs-p
906      (((class color)) (:foreground "firebrick" :background "pale green"))        '((((class color) (min-colors 16))
907      (t               (:inverse-video t)))           (:foreground "firebrick" :background "pale green"))
908            (((class color))
909             (:foreground "blue3" :background "yellow3"))
910            (t                   (:inverse-video t)))
911        '((((type tty))    (:foreground "blue3" :background "yellow3"))
912          (((class color)) (:foreground "firebrick" :background "pale green"))
913          (t                     (:inverse-video t))))
914    "Face for highlighting the selected difference in buffer A."    "Face for highlighting the selected difference in buffer A."
915    :group 'ediff-highlighting)    :group 'ediff-highlighting)
916  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 925  this variable represents.") Line 931  this variable represents.")
931    
932    
933  (defface ediff-current-diff-face-B  (defface ediff-current-diff-face-B
934    '((((type tty))    (:foreground "magenta3" :background "yellow3"    (if ediff-emacs-p
935                                    :weight bold))        '((((class color) (min-colors 16))
936      (((class color)) (:foreground "DarkOrchid" :background "Yellow"))           (:foreground "DarkOrchid" :background "Yellow"))
937      (t               (:inverse-video t)))          (((class color))
938             (:foreground "magenta3" :background "yellow3"
939                          :weight bold))
940            (t                   (:inverse-video t)))
941        '((((type tty))    (:foreground "magenta3" :background "yellow3"
942                                        :weight bold))
943          (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
944          (t                     (:inverse-video t))))
945    "Face for highlighting the selected difference in buffer B."    "Face for highlighting the selected difference in buffer B."
946    :group 'ediff-highlighting)    :group 'ediff-highlighting)
947  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 948  this variable represents.") Line 961  this variable represents.")
961    
962    
963  (defface ediff-current-diff-face-C  (defface ediff-current-diff-face-C
964    '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))    (if ediff-emacs-p
965      (((class color)) (:foreground "Navy" :background "Pink"))        '((((class color) (min-colors 16))
966      (t               (:inverse-video t)))           (:foreground "Navy" :background "Pink"))
967            (((class color))
968             (:foreground "cyan3" :background "yellow3" :weight bold))
969            (t                   (:inverse-video t)))
970        '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))
971          (((class color)) (:foreground "Navy" :background "Pink"))
972          (t                     (:inverse-video t))))
973    "Face for highlighting the selected difference in buffer C."    "Face for highlighting the selected difference in buffer C."
974    :group 'ediff-highlighting)    :group 'ediff-highlighting)
975  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 970  this variable represents.") Line 989  this variable represents.")
989    
990    
991  (defface ediff-current-diff-face-Ancestor  (defface ediff-current-diff-face-Ancestor
992    '((((type tty))    (:foreground "black" :background "magenta3"))    (if ediff-emacs-p
993      (((class color)) (:foreground "Black" :background "VioletRed"))        '((((class color) (min-colors 16))
994      (t (:inverse-video t)))           (:foreground "Black" :background "VioletRed"))
995            (((class color))
996             (:foreground "black" :background "magenta3"))
997            (t (:inverse-video t)))
998        '((((type tty))    (:foreground "black" :background "magenta3"))
999          (((class color)) (:foreground "Black" :background "VioletRed"))
1000          (t (:inverse-video t))))
1001    "Face for highlighting the selected difference in buffer Ancestor."    "Face for highlighting the selected difference in buffer Ancestor."
1002    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1003  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 992  this variable represents.") Line 1017  this variable represents.")
1017    
1018    
1019  (defface ediff-fine-diff-face-A  (defface ediff-fine-diff-face-A
1020    '((((type tty))    (:foreground "white" :background "sky blue" :weight bold))    (if ediff-emacs-p
1021      (((class color)) (:foreground "Navy" :background "sky blue"))        '((((class color) (min-colors 16))
1022      (t (:underline t :stipple "gray3")))           (:foreground "Navy" :background "sky blue"))
1023            (((class color))
1024             (:foreground "white" :background "sky blue" :weight bold))
1025            (t (:underline t :stipple "gray3")))
1026        '((((type tty))    (:foreground "white" :background "sky blue" :weight bold))
1027          (((class color)) (:foreground "Navy" :background "sky blue"))
1028          (t (:underline t :stipple "gray3"))))
1029    "Face for highlighting the refinement of the selected diff in buffer A."    "Face for highlighting the refinement of the selected diff in buffer A."
1030    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1031  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1007  this variable represents.") Line 1038  this variable represents.")
1038  (ediff-hide-face 'ediff-fine-diff-face-A)  (ediff-hide-face 'ediff-fine-diff-face-A)
1039    
1040  (defface ediff-fine-diff-face-B  (defface ediff-fine-diff-face-B
1041    '((((type tty))    (:foreground "magenta3" :background "cyan3"))    (if ediff-emacs-p
1042      (((class color)) (:foreground "Black" :background "cyan"))        '((((class color) (min-colors 16))
1043      (t               (:underline t :stipple "gray3")))           (:foreground "Black" :background "cyan"))
1044            (((class color))
1045             (:foreground "magenta3" :background "cyan3"))
1046            (t                   (:underline t :stipple "gray3")))
1047        '((((type tty))    (:foreground "magenta3" :background "cyan3"))
1048          (((class color)) (:foreground "Black" :background "cyan"))
1049          (t                     (:underline t :stipple "gray3"))))
1050    "Face for highlighting the refinement of the selected diff in buffer B."    "Face for highlighting the refinement of the selected diff in buffer B."
1051    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1052  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1022  this variable represents.") Line 1059  this variable represents.")
1059  (ediff-hide-face 'ediff-fine-diff-face-B)  (ediff-hide-face 'ediff-fine-diff-face-B)
1060    
1061  (defface ediff-fine-diff-face-C  (defface ediff-fine-diff-face-C
1062    '((((type tty))    (:foreground "yellow3" :background "Turquoise"    (if ediff-emacs-p
1063                                    :weight bold))        '((((type pc))
1064      (((type pc))     (:foreground "white" :background "Turquoise"))           (:foreground "white" :background "Turquoise"))
1065      (((class color)) (:foreground "Black" :background "Turquoise"))          (((class color) (min-colors 16))
1066      (t (:underline t :stipple "gray3")))           (:foreground "Black" :background "Turquoise"))
1067            (((class color))
1068             (:foreground "yellow3" :background "Turquoise"
1069                          :weight bold))
1070            (t (:underline t :stipple "gray3")))
1071        '((((type tty))    (:foreground "yellow3" :background "Turquoise"
1072                                        :weight bold))
1073          (((type pc))     (:foreground "white" :background "Turquoise"))
1074          (((class color)) (:foreground "Black" :background "Turquoise"))
1075          (t (:underline t :stipple "gray3"))))
1076    "Face for highlighting the refinement of the selected diff in buffer C."    "Face for highlighting the refinement of the selected diff in buffer C."
1077    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1078  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1039  this variable represents.") Line 1085  this variable represents.")
1085  (ediff-hide-face 'ediff-fine-diff-face-C)  (ediff-hide-face 'ediff-fine-diff-face-C)
1086    
1087  (defface ediff-fine-diff-face-Ancestor  (defface ediff-fine-diff-face-Ancestor
1088    '((((type tty))    (:foreground "red3" :background "green"))    (if ediff-emacs-p
1089      (((class color)) (:foreground "Black" :background "Green"))        '((((class color) (min-colors 16))
1090      (t               (:underline t :stipple "gray3")))           (:foreground "Black" :background "Green"))
1091            (((class color))
1092             (:foreground "red3" :background "green"))
1093            (t                   (:underline t :stipple "gray3")))
1094        '((((type tty))    (:foreground "red3" :background "green"))
1095          (((class color)) (:foreground "Black" :background "Green"))
1096          (t                     (:underline t :stipple "gray3"))))
1097    "Face for highlighting the refinement of the selected diff in the ancestor buffer.    "Face for highlighting the refinement of the selected diff in the ancestor buffer.
1098  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
1099  ancestor buffer."  ancestor buffer."
# Line 1065  this variable represents.") Line 1117  this variable represents.")
1117          (t "Stipple")))          (t "Stipple")))
1118    
1119  (defface ediff-even-diff-face-A  (defface ediff-even-diff-face-A
1120    `((((type tty))    (:foreground "red3" :background "light grey"    (if ediff-emacs-p
1121                                    :weight bold))        `((((type pc))
1122      (((type pc))     (:foreground "green3" :background "light grey"))           (:foreground "green3" :background "light grey"))
1123      (((class color)) (:foreground "Black" :background "light grey"))          (((class color) (min-colors 16))
1124      (t               (:italic t :stipple ,stipple-pixmap)))           (:foreground "Black" :background "light grey"))
1125            (((class color))
1126             (:foreground "red3" :background "light grey"
1127                          :weight bold))
1128            (t                   (:italic t :stipple ,stipple-pixmap)))
1129        `((((type tty))    (:foreground "red3" :background "light grey"
1130                                        :weight bold))
1131          (((type pc))     (:foreground "green3" :background "light grey"))
1132          (((class color)) (:foreground "Black" :background "light grey"))
1133          (t                     (:italic t :stipple ,stipple-pixmap))))
1134    "Face for highlighting even-numbered non-current differences in buffer A."    "Face for highlighting even-numbered non-current differences in buffer A."
1135    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1136  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1082  this variable represents.") Line 1143  this variable represents.")
1143  (ediff-hide-face 'ediff-even-diff-face-A)  (ediff-hide-face 'ediff-even-diff-face-A)
1144    
1145  (defface ediff-even-diff-face-B  (defface ediff-even-diff-face-B
1146    `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))    (if ediff-emacs-p
1147      (((class color)) (:foreground "White" :background "Grey"))        `((((class color) (min-colors 16))
1148      (t               (:italic t :stipple ,stipple-pixmap)))           (:foreground "White" :background "Grey"))
1149            (((class color))    
1150             (:foreground "blue3" :background "Grey" :weight bold))
1151            (t                   (:italic t :stipple ,stipple-pixmap)))
1152        `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))
1153          (((class color)) (:foreground "White" :background "Grey"))
1154          (t                     (:italic t :stipple ,stipple-pixmap))))
1155    "Face for highlighting even-numbered non-current differences in buffer B."    "Face for highlighting even-numbered non-current differences in buffer B."
1156    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1157  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1097  this variable represents.") Line 1164  this variable represents.")
1164  (ediff-hide-face 'ediff-even-diff-face-B)  (ediff-hide-face 'ediff-even-diff-face-B)
1165    
1166  (defface ediff-even-diff-face-C  (defface ediff-even-diff-face-C
1167    `((((type tty))    (:foreground "yellow3" :background "light grey"    (if ediff-emacs-p
1168                                    :weight bold))        `((((type pc))
1169      (((type pc))     (:foreground "yellow3" :background "light grey"))           (:foreground "yellow3" :background "light grey"))
1170      (((class color)) (:foreground "Black" :background "light grey"))          (((class color) (min-colors 16))
1171      (t               (:italic t :stipple ,stipple-pixmap)))           (:foreground "Black" :background "light grey"))
1172            (((class color))
1173             (:foreground "yellow3" :background "light grey"
1174                          :weight bold))
1175            (t                   (:italic t :stipple ,stipple-pixmap)))
1176        `((((type tty))    (:foreground "yellow3" :background "light grey"
1177                                        :weight bold))
1178          (((type pc))     (:foreground "yellow3" :background "light grey"))
1179          (((class color)) (:foreground "Black" :background "light grey"))
1180          (t                     (:italic t :stipple ,stipple-pixmap))))
1181    "Face for highlighting even-numbered non-current differences in buffer C."    "Face for highlighting even-numbered non-current differences in buffer C."
1182    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1183  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1114  this variable represents.") Line 1190  this variable represents.")
1190  (ediff-hide-face 'ediff-even-diff-face-C)  (ediff-hide-face 'ediff-even-diff-face-C)
1191    
1192  (defface ediff-even-diff-face-Ancestor  (defface ediff-even-diff-face-Ancestor
1193    `((((type tty))    (:foreground "cyan3" :background "light grey"    (if ediff-emacs-p
1194                                    :weight bold))        `((((type pc))
1195      (((type pc))     (:foreground "cyan3" :background "light grey"))           (:foreground "cyan3" :background "light grey"))
1196      (((class color)) (:foreground "White" :background "Grey"))          (((class color) (min-colors 16))
1197      (t (:italic t :stipple ,stipple-pixmap)))           (:foreground "White" :background "Grey"))
1198            (((class color))
1199             (:foreground "cyan3" :background "light grey"
1200                          :weight bold))
1201            (t (:italic t :stipple ,stipple-pixmap)))
1202        `((((type tty))    (:foreground "cyan3" :background "light grey"
1203                                        :weight bold))
1204          (((type pc))     (:foreground "cyan3" :background "light grey"))
1205          (((class color)) (:foreground "White" :background "Grey"))
1206          (t (:italic t :stipple ,stipple-pixmap))))
1207    "Face for highlighting even-numbered non-current differences in the ancestor buffer."    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1208    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1209  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1138  this variable represents.") Line 1223  this variable represents.")
1223      (Ancestor . ediff-even-diff-face-Ancestor)))      (Ancestor . ediff-even-diff-face-Ancestor)))
1224    
1225  (defface ediff-odd-diff-face-A  (defface ediff-odd-diff-face-A
1226    '((((type tty))    (:foreground "red3" :background "black" :weight bold))    (if ediff-emacs-p
1227      (((type pc))     (:foreground "green3" :background "gray40"))        '((((type pc))
1228      (((class color)) (:foreground "White" :background "Grey"))           (:foreground "green3" :background "gray40"))
1229      (t               (:italic t :stipple "gray1")))          (((class color) (min-colors 16))
1230             (:foreground "White" :background "Grey"))
1231            (((class color))
1232             (:foreground "red3" :background "black" :weight bold))
1233            (t                   (:italic t :stipple "gray1")))
1234        '((((type tty))    (:foreground "red3" :background "black" :weight bold))
1235          (((type pc))     (:foreground "green3" :background "gray40"))
1236          (((class color)) (:foreground "White" :background "Grey"))
1237          (t                     (:italic t :stipple "gray1"))))
1238    "Face for highlighting odd-numbered non-current differences in buffer A."    "Face for highlighting odd-numbered non-current differences in buffer A."
1239    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1240  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1155  this variable represents.") Line 1248  this variable represents.")
1248    
1249    
1250  (defface ediff-odd-diff-face-B  (defface ediff-odd-diff-face-B
1251    '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))    (if ediff-emacs-p
1252      (((type pc))     (:foreground "White" :background "gray40"))        '((((type pc))
1253      (((class color)) (:foreground "Black" :background "light grey"))           (:foreground "White" :background "gray40"))
1254      (t               (:italic t :stipple "gray1")))          (((class color) (min-colors 16))
1255             (:foreground "Black" :background "light grey"))
1256            (((class color))
1257             (:foreground "cyan3" :background "black" :weight bold))
1258            (t                   (:italic t :stipple "gray1")))
1259        '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))
1260          (((type pc))     (:foreground "White" :background "gray40"))
1261          (((class color)) (:foreground "Black" :background "light grey"))
1262          (t                     (:italic t :stipple "gray1"))))
1263    "Face for highlighting odd-numbered non-current differences in buffer B."    "Face for highlighting odd-numbered non-current differences in buffer B."
1264    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1265  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1171  this variable represents.") Line 1272  this variable represents.")
1272  (ediff-hide-face 'ediff-odd-diff-face-B)  (ediff-hide-face 'ediff-odd-diff-face-B)
1273    
1274  (defface ediff-odd-diff-face-C  (defface ediff-odd-diff-face-C
1275    '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))    (if ediff-emacs-p
1276      (((type pc))     (:foreground "yellow3" :background "gray40"))        '((((type pc))
1277      (((class color)) (:foreground "White" :background "Grey"))           (:foreground "yellow3" :background "gray40"))
1278      (t               (:italic t :stipple "gray1")))          (((class color) (min-colors 16))
1279             (:foreground "White" :background "Grey"))
1280            (((class color))
1281             (:foreground "yellow3" :background "black" :weight bold))
1282            (t                   (:italic t :stipple "gray1")))
1283        '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))
1284          (((type pc))     (:foreground "yellow3" :background "gray40"))
1285          (((class color)) (:foreground "White" :background "Grey"))
1286          (t                     (:italic t :stipple "gray1"))))
1287    "Face for highlighting odd-numbered non-current differences in buffer C."    "Face for highlighting odd-numbered non-current differences in buffer C."
1288    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1289  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
# Line 1187  this variable represents.") Line 1296  this variable represents.")
1296  (ediff-hide-face 'ediff-odd-diff-face-C)  (ediff-hide-face 'ediff-odd-diff-face-C)
1297    
1298  (defface ediff-odd-diff-face-Ancestor  (defface ediff-odd-diff-face-Ancestor
1299    '((((type tty))    (:foreground "green3" :background "black" :weight bold))    (if ediff-emacs-p
1300      (((class color)) (:foreground "cyan3" :background "gray40"))        '((((class color) (min-colors 16))
1301      (t               (:italic t :stipple "gray1")))           (:foreground "cyan3" :background "gray40"))
1302            (((class color))
1303             (:foreground "green3" :background "black" :weight bold))
1304            (t                   (:italic t :stipple "gray1")))
1305        '((((type tty))    (:foreground "green3" :background "black" :weight bold))
1306          (((class color)) (:foreground "cyan3" :background "gray40"))
1307          (t                     (:italic t :stipple "gray1"))))
1308    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1309    :group 'ediff-highlighting)    :group 'ediff-highlighting)
1310  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,

Legend:
Removed from v.1.62.6.1  
changed lines
  Added in v.1.62.6.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26