author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Fri, 15 Oct 2010 18:02:18 +0300 | |
changeset 498 | 3f8ba1f0e12a |
parent 495 | 4a104ee74108 (current diff) |
parent 497 | 1848e3b1fc00 (diff) |
child 501 | 01ea09b00f76 |
child 505 | eb7d261fa539 |
--- a/.emacs-my Sun Oct 03 18:39:42 2010 +0300 +++ b/.emacs-my Fri Oct 15 18:02:18 2010 +0300 @@ -774,6 +774,7 @@ (progn ;; Use shell from Cygwin/MinGW. (setq shell-file-name "bash") + (setenv "SHELL" "/bin/bash") ) ) ;; (setq explicit-shell-file-name "bash") @@ -990,6 +991,7 @@ (setq diff-switches "-u") (setq ediff-diff-options "") +(setq ediff-custom-diff-options "-u") ;;; ---------------------------------------------------------------- ;;; indenting.