equal
deleted
inserted
replaced
1860 |
1860 |
1861 (setq diff-switches "-u") |
1861 (setq diff-switches "-u") |
1862 |
1862 |
1863 (setq ediff-diff-options "") |
1863 (setq ediff-diff-options "") |
1864 (setq ediff-custom-diff-options "-u") |
1864 (setq ediff-custom-diff-options "-u") |
|
1865 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1865 |
1866 |
1866 (when window-system |
1867 (when window-system |
1867 (eval-after-load 'diff-mode |
1868 (eval-after-load 'diff-mode |
1868 '(progn |
1869 '(progn |
1869 (set-face-foreground 'diff-added-face "DarkGreen") |
1870 (set-face-foreground 'diff-added-face "DarkGreen") |