diff options
| -rw-r--r-- | lisp/ediff-init.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 833c55f87e3..fc91c7bbea2 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -992,7 +992,7 @@ this variable represents.") | |||
| 992 | 992 | ||
| 993 | (defface ediff-even-diff-face-A | 993 | (defface ediff-even-diff-face-A |
| 994 | '((((class color)) (:foreground "Black" :background "light grey")) | 994 | '((((class color)) (:foreground "Black" :background "light grey")) |
| 995 | (t (:italic t :stipple "Stipple"))) | 995 | (t (:italic t :stipple "stipple"))) |
| 996 | "Face for highlighting even-numbered non-current differences in buffer A." | 996 | "Face for highlighting even-numbered non-current differences in buffer A." |
| 997 | :group 'ediff-highlighting) | 997 | :group 'ediff-highlighting) |
| 998 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 998 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| @@ -1006,7 +1006,7 @@ this variable represents.") | |||
| 1006 | 1006 | ||
| 1007 | (defface ediff-even-diff-face-B | 1007 | (defface ediff-even-diff-face-B |
| 1008 | '((((class color)) (:foreground "White" :background "Grey")) | 1008 | '((((class color)) (:foreground "White" :background "Grey")) |
| 1009 | (t (:italic t :stipple "Stipple"))) | 1009 | (t (:italic t :stipple "stipple"))) |
| 1010 | "Face for highlighting even-numbered non-current differences in buffer B." | 1010 | "Face for highlighting even-numbered non-current differences in buffer B." |
| 1011 | :group 'ediff-highlighting) | 1011 | :group 'ediff-highlighting) |
| 1012 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1012 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| @@ -1020,7 +1020,7 @@ this variable represents.") | |||
| 1020 | 1020 | ||
| 1021 | (defface ediff-even-diff-face-C | 1021 | (defface ediff-even-diff-face-C |
| 1022 | '((((class color)) (:foreground "Black" :background "light grey")) | 1022 | '((((class color)) (:foreground "Black" :background "light grey")) |
| 1023 | (t (:italic t :stipple "Stipple"))) | 1023 | (t (:italic t :stipple "stipple"))) |
| 1024 | "Face for highlighting even-numbered non-current differences in buffer C." | 1024 | "Face for highlighting even-numbered non-current differences in buffer C." |
| 1025 | :group 'ediff-highlighting) | 1025 | :group 'ediff-highlighting) |
| 1026 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1026 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, |
| @@ -1034,7 +1034,7 @@ this variable represents.") | |||
| 1034 | 1034 | ||
| 1035 | (defface ediff-even-diff-face-Ancestor | 1035 | (defface ediff-even-diff-face-Ancestor |
| 1036 | '((((class color)) (:foreground "White" :background "Grey")) | 1036 | '((((class color)) (:foreground "White" :background "Grey")) |
| 1037 | (t (:italic t :stipple "Stipple"))) | 1037 | (t (:italic t :stipple "stipple"))) |
| 1038 | "Face for highlighting even-numbered non-current differences in the ancestor buffer." | 1038 | "Face for highlighting even-numbered non-current differences in the ancestor buffer." |
| 1039 | :group 'ediff-highlighting) | 1039 | :group 'ediff-highlighting) |
| 1040 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | 1040 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, |