equal
deleted
inserted
replaced
772 (setq find-ls-option '("-exec ls -ld {} ;" . "-ld")) |
772 (setq find-ls-option '("-exec ls -ld {} ;" . "-ld")) |
773 ) |
773 ) |
774 (progn |
774 (progn |
775 ;; Use shell from Cygwin/MinGW. |
775 ;; Use shell from Cygwin/MinGW. |
776 (setq shell-file-name "bash") |
776 (setq shell-file-name "bash") |
|
777 (setenv "SHELL" "/bin/bash") |
777 ) |
778 ) |
778 ) |
779 ) |
779 ;; (setq explicit-shell-file-name "bash") |
780 ;; (setq explicit-shell-file-name "bash") |
780 (setq explicit-bash-args '("-i")) |
781 (setq explicit-bash-args '("-i")) |
781 (setq explicit-sh-args '("-i")) |
782 (setq explicit-sh-args '("-i")) |
988 ;;; diff, patch, ediff, emerge. |
989 ;;; diff, patch, ediff, emerge. |
989 |
990 |
990 (setq diff-switches "-u") |
991 (setq diff-switches "-u") |
991 |
992 |
992 (setq ediff-diff-options "") |
993 (setq ediff-diff-options "") |
|
994 (setq ediff-custom-diff-options "-u") |
993 |
995 |
994 ;;; ---------------------------------------------------------------- |
996 ;;; ---------------------------------------------------------------- |
995 ;;; indenting. |
997 ;;; indenting. |
996 |
998 |
997 (setq standard-indent 4) |
999 (setq standard-indent 4) |