equal
deleted
inserted
replaced
991 ;;; diff, patch, ediff, emerge. |
991 ;;; diff, patch, ediff, emerge. |
992 |
992 |
993 (setq diff-switches "-u") |
993 (setq diff-switches "-u") |
994 |
994 |
995 (setq ediff-diff-options "") |
995 (setq ediff-diff-options "") |
|
996 (setq ediff-custom-diff-options "-u") |
996 |
997 |
997 ;;; ---------------------------------------------------------------- |
998 ;;; ---------------------------------------------------------------- |
998 ;;; indenting. |
999 ;;; indenting. |
999 |
1000 |
1000 (setq standard-indent 4) |
1001 (setq standard-indent 4) |