dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 4107fda..2ab16ad 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -97,6 +97,9 @@
 (require 'paren)
 (trap (show-paren-mode t))
 (or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
+(setq x-select-enable-clipboard nil
+      x-select-enable-primary t
+      mouse-drag-copy-region t)
 
 ;; Multiple cursors.