dot/inputrc: Guard `shell-mumble' bindings.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 86489e8..908bc6c 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -344,6 +344,7 @@
 (setq scroll-step 5)                   ;Don't scroll too much at a time
 (setq blink-cursor-blinks 0)           ;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
+(setq adaptive-fill-mode nil)          ;I have my own machinery instead
 (setq reb-re-syntax 'string)           ;Enough backslashes even with this
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
@@ -650,6 +651,8 @@
   (global-set-key [?\C-c ?m ?m] 'magit-status)
   (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 ?4 ?f] 'magit-find-file-other-window)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
   (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
   (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)