[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Eli Zaretskii]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.57 emacs/lisp/ediff-init.el:1.58
*** emacs/lisp/ediff-init.el:1.57       Wed Mar 20 01:36:18 2002
--- emacs/lisp/ediff-init.el    Mon Apr 15 14:30:38 2002
***************
*** 902,909 ****
  
  
  (defface ediff-current-diff-face-A
!   '((((class color)) (:foreground "firebrick" :background "pale green"))
!     (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 902,910 ----
  
  
  (defface ediff-current-diff-face-A
!   '((((type tty))    (:foreground "blue3" :background "yellow3"))
!     (((class color)) (:foreground "firebrick" :background "pale green"))
!     (t                     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 924,931 ****
  
  
  (defface ediff-current-diff-face-B
!   '((((class color)) (:foreground "DarkOrchid" :background "Yellow"))
!     (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 925,934 ----
  
  
  (defface ediff-current-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "yellow3"
!                                 :weight bold))
!     (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
!     (t                     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 945,952 ****
  
  
  (defface ediff-current-diff-face-C
!   '((((class color)) (:foreground "Navy" :background "Pink"))
!     (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 948,956 ----
  
  
  (defface ediff-current-diff-face-C
!   '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))
!     (((class color)) (:foreground "Navy" :background "Pink"))
!     (t                     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 966,972 ****
  
  
  (defface ediff-current-diff-face-Ancestor
!   '((((class color)) (:foreground "Black" :background "VioletRed"))
      (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
--- 970,977 ----
  
  
  (defface ediff-current-diff-face-Ancestor
!   '((((type tty))    (:foreground "black" :background "magenta3"))
!     (((class color)) (:foreground "Black" :background "VioletRed"))
      (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
***************
*** 987,993 ****
  
  
  (defface ediff-fine-diff-face-A
!   '((((class color)) (:foreground "Navy" :background "sky blue"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
--- 992,999 ----
  
  
  (defface ediff-fine-diff-face-A
!   '((((type tty))    (:foreground "white" :background "sky blue" :weight 
bold))
!     (((class color)) (:foreground "Navy" :background "sky blue"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
***************
*** 1001,1008 ****
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   '((((class color)) (:foreground "Black" :background "cyan"))
!     (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1007,1015 ----
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "cyan3"))
!     (((class color)) (:foreground "Black" :background "cyan"))
!     (t                     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1015,1021 ****
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   '((((class color)) (:foreground "Black" :background "Turquoise"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
--- 1022,1031 ----
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "Turquoise"
!                                 :weight bold))
!     (((type pc))     (:foreground "white" :background "Turquoise"))
!     (((class color)) (:foreground "Black" :background "Turquoise"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
***************
*** 1029,1036 ****
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   '((((class color)) (:foreground "Black" :background "Green"))
!     (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in the ancestor 
buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
--- 1039,1047 ----
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   '((((type tty))    (:foreground "red3" :background "green"))
!     (((class color)) (:foreground "Black" :background "Green"))
!     (t                     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in the ancestor 
buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
***************
*** 1054,1061 ****
        (t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   `((((class color)) (:foreground "Black" :background "light grey"))
!     (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1065,1075 ----
        (t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   `((((type tty))    (:foreground "red3" :background "light grey"
!                                 :weight bold))
!     (((type pc))     (:foreground "green3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t                     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1068,1075 ****
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   `((((class color)) (:foreground "White" :background "Grey"))
!     (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1082,1090 ----
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t                     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1082,1089 ****
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   `((((class color)) (:foreground "Black" :background "light grey"))
!     (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1097,1107 ----
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   `((((type tty))    (:foreground "yellow3" :background "light grey"
!                                 :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t                     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1096,1102 ****
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   `((((class color)) (:foreground "White" :background "Grey"))
      (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in the 
ancestor buffer."
    :group 'ediff-highlighting)
--- 1114,1123 ----
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   `((((type tty))    (:foreground "cyan3" :background "light grey"
!                                 :weight bold))
!     (((type pc))     (:foreground "cyan3" :background "light grey"))
!     (((class color)) (:foreground "White" :background "Grey"))
      (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in the 
ancestor buffer."
    :group 'ediff-highlighting)
***************
*** 1117,1124 ****
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   '((((class color)) (:foreground "White" :background "Grey"))
!     (t (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1138,1147 ----
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   '((((type tty))    (:foreground "red3" :background "black" :weight bold))
!     (((type pc))     (:foreground "green3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t                     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1132,1139 ****
  
  
  (defface ediff-odd-diff-face-B
!   '((((class color)) (:foreground "Black" :background "light grey"))
!     (t (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1155,1164 ----
  
  
  (defface ediff-odd-diff-face-B
!   '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))
!     (((type pc))     (:foreground "White" :background "gray40"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t                     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1146,1153 ****
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   '((((class color)) (:foreground "White" :background "Grey"))
!     (t (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1171,1180 ----
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t                     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
***************
*** 1160,1167 ****
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   '((((class color)) (:foreground "Black" :background "light grey"))
!     (t (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in the ancestor 
buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
--- 1187,1195 ----
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   '((((type tty))    (:foreground "green3" :background "black" :weight bold))
!     (((class color)) (:foreground "cyan3" :background "gray40"))
!     (t                     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in the ancestor 
buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,