dot/emacs: Tell `ediff' not to move the mouse pointer.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index c43acb6..000be6a 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -412,6 +412,7 @@
 (setq find-ls-option                   ;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)            ;Save bookmarks automatically
+(setq ediff-grab-mouse nil)
 (setq vc-follow-symlinks t
       vc-git-resolve-conflicts nil)
 (setq x-gtk-file-dialog-help-text nil)
@@ -740,6 +741,7 @@
   (global-set-key [?\C-c ?m ?b] 'magit-blame)
   (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
   (global-set-key [?\C-c ?m ?f] 'magit-find-file)
+  (global-set-key [?\C-c ?m ?l] 'magit-toggle-buffer-lock)
   (global-set-key [?\C-c ?m ?m] 'magit-status)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
   (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
@@ -765,6 +767,7 @@
   (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
   (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
   (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
+  (global-set-key [?\C-c ?w ? ] 'mdw-designate-window)
   (global-set-key [?\C-c ?w ?b] 'w3m-bookmark-view)
   (global-set-key [?\C-c ?w ?c] 'mdw-set-frame-colour)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
@@ -773,6 +776,7 @@
   (global-set-key [?\C-c ?w ?k] 'windmove-up)
   (global-set-key [?\C-c ?w ?l] 'windmove-right)
   (global-set-key [?\C-c ?w ?r] 'winner-redo)
+  (global-set-key [?\C-c ?w ?s] 'mdw-switch-window-configuration)
   (global-set-key [?\C-c ?w ?u] 'winner-undo)
   (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width)
   (global-set-key [?\C-c ?w up] 'windmove-up)