equal
deleted
inserted
replaced
1869 (setq ediff-diff-options "") |
1869 (setq ediff-diff-options "") |
1870 (setq ediff-custom-diff-options "-u") |
1870 (setq ediff-custom-diff-options "-u") |
1871 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1871 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1872 (setq ediff-split-window-function 'split-window-vertically) |
1872 (setq ediff-split-window-function 'split-window-vertically) |
1873 |
1873 |
|
1874 (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1)) |
|
1875 |
1874 (when window-system |
1876 (when window-system |
|
1877 (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) |
1875 (eval-after-load 'diff-mode |
1878 (eval-after-load 'diff-mode |
1876 '(progn |
1879 '(progn |
1877 (set-face-foreground 'diff-added-face "DarkGreen") |
1880 (set-face-foreground 'diff-added-face "DarkGreen") |
1878 (set-face-foreground 'diff-removed-face "DarkRed") |
1881 (set-face-foreground 'diff-removed-face "DarkRed") |
1879 ))) |
1882 ))) |