equal
deleted
inserted
replaced
1871 (setq ediff-diff-options "") |
1871 (setq ediff-diff-options "") |
1872 (setq ediff-custom-diff-options "-u") |
1872 (setq ediff-custom-diff-options "-u") |
1873 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1873 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1874 (setq ediff-split-window-function 'split-window-vertically) |
1874 (setq ediff-split-window-function 'split-window-vertically) |
1875 |
1875 |
1876 (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1)) |
1876 ;; Disable: sometimes it take a long time to process large hunks. |
1877 (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) |
1877 ;; Use C-c C-b on hunk by own. |
|
1878 ;; (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1)) |
|
1879 ;; (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) |
1878 |
1880 |
1879 (when window-system |
1881 (when window-system |
1880 (eval-after-load 'diff-mode |
1882 (eval-after-load 'diff-mode |
1881 '(progn |
1883 '(progn |
1882 (set-face-foreground 'diff-added-face "DarkGreen") |
1884 (set-face-foreground 'diff-added-face "DarkGreen") |