| changeset 977 | f1c1a26ad0b9 |
| parent 976 | 9378739883bb |
| child 984 | 3dea749e5fe2 |
| 976:9378739883bb | 977:f1c1a26ad0b9 |
|---|---|
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)) |
1874 (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1)) |
1875 (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) |
|
1875 |
1876 |
1876 (when window-system |
1877 (when window-system |
1877 (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) |
|
1878 (eval-after-load 'diff-mode |
1878 (eval-after-load 'diff-mode |
1879 '(progn |
1879 '(progn |
1880 (set-face-foreground 'diff-added-face "DarkGreen") |
1880 (set-face-foreground 'diff-added-face "DarkGreen") |
1881 (set-face-foreground 'diff-removed-face "DarkRed") |
1881 (set-face-foreground 'diff-removed-face "DarkRed") |
1882 (set-face-background 'diff-refine-change "LightBlue1") |
|
1882 ))) |
1883 ))) |
1883 |
1884 |
1884 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1885 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1885 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil") |
1886 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil") |
1886 |
1887 |