diff options
| author | Miquel Sabaté Solà <msabate@suse.com> | 2016-12-19 10:57:32 +0100 |
|---|---|---|
| committer | Miquel Sabaté Solà <msabate@suse.com> | 2016-12-19 10:57:32 +0100 |
| commit | 917d1105647929fd6e0c7034b859266c26008ef8 (patch) | |
| tree | 32cde1e92c28d01a2665ca883075fbd8f0931718 /emacs | |
| parent | 46657d088a86df00e87fce733cf0713890330854 (diff) | |
| download | dotfiles-917d1105647929fd6e0c7034b859266c26008ef8.tar.gz dotfiles-917d1105647929fd6e0c7034b859266c26008ef8.zip | |
emacs: some minor updates
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/init.el | 4 | ||||
| -rw-r--r-- | emacs/settings/init-edit.el | 3 | ||||
| -rw-r--r-- | emacs/settings/init-general.el | 3 | ||||
| -rw-r--r-- | emacs/settings/init-mu4e.el | 5 |
4 files changed, 12 insertions, 3 deletions
diff --git a/emacs/init.el b/emacs/init.el index 1692150..b1b1e4d 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -35,7 +35,9 @@ ;;; Preface -;; I'm sticking with the major version I'm using, deal with it. +;; I'm using GNU Emacs 25, but everything should be working in GNU Emacs +;; 24. There are some exceptions to this (e.g. webkit support), but these cases +;; are individually handled. (unless (>= emacs-major-version 24) (error "Don't be a cheap bastard and upgrade to at least GNU Emacs 24")) 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. |