3 files changed, 9 insertions, 2 deletions
diff --git a/emacs/settings/init-edit.el b/emacs/settings/init-edit.el
index 708b108..77ff61f 100644
--- a/emacs/settings/init-edit.el
+++ b/emacs/settings/init-edit.el
@@ -20,6 +20,9 @@
 
 (require 'use-package)
 
+;; Disable overwrite-mode.
+(define-key global-map [(insert)] nil)
+
 ;; undo-tree
 
 (global-undo-tree-mode 1)
diff --git a/emacs/settings/init-general.el b/emacs/settings/init-general.el
index 069259c..57d9ecf 100644
--- a/emacs/settings/init-general.el
+++ b/emacs/settings/init-general.el
@@ -110,6 +110,9 @@
   (lambda ()
     (set-face-attribute 'default t :font "Droid Sans Mono Dotted for Powerline-10")))
 
+; Use kill-this-buffer instead of kill-buffer
+(global-set-key (kbd "C-x k") 'kill-this-buffer)
+
 ;; Disable C-z. It will later on be picked up by Evil's config as the escape
 ;; sequence. This is here to make sure that it will be disabled even if Evil
 ;; cannot be loaded due to some error.
diff --git a/emacs/settings/init-mu4e.el b/emacs/settings/init-mu4e.el
index 59ffe6f..cc29e60 100644
--- a/emacs/settings/init-mu4e.el
+++ b/emacs/settings/init-mu4e.el
@@ -182,8 +182,9 @@
 
   ; As of 0.9.18 and GNU Emacs 25, the mu4e-action-with-xwidget can be used to
   ; render an HTML message with Webkit.
-  (add-to-list 'mu4e-view-actions
-               '("webkit" . mu4e-action-view-with-xwidget))
+  (if (>= emacs-major-version 25)
+      (add-to-list 'mu4e-view-actions
+                   '("webkit" . mu4e-action-view-with-xwidget)))
 
   ;; Addings hooks for composing and viewing messages.