equal
deleted
inserted
replaced
1279 |
1279 |
1280 (setq diff-switches "-u") |
1280 (setq diff-switches "-u") |
1281 |
1281 |
1282 (setq ediff-diff-options "") |
1282 (setq ediff-diff-options "") |
1283 (setq ediff-custom-diff-options "-u") |
1283 (setq ediff-custom-diff-options "-u") |
|
1284 |
|
1285 (when window-system |
|
1286 (eval-after-load 'diff-mode |
|
1287 '(progn |
|
1288 (set-face-foreground 'diff-added-face "DarkGreen") |
|
1289 (set-face-foreground 'diff-removed-face "DarkRed") |
|
1290 ))) |
1284 |
1291 |
1285 ;;; ---------------------------------------------------------------- |
1292 ;;; ---------------------------------------------------------------- |
1286 (message "indenting") |
1293 (message "indenting") |
1287 |
1294 |
1288 (setq standard-indent 4) |
1295 (setq standard-indent 4) |