aboutsummaryrefslogtreecommitdiff
path: root/home/.emacs.d
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-12-24 15:09:09 +0100
committerJakob Odersky <jakob@odersky.com>2016-12-24 15:09:09 +0100
commit81d5fc817ea5dbfb88e5318ff17d5cda81c9b7c5 (patch)
treef2c9d25dccf7e34c0e85c3990dafdb6102d1e6aa /home/.emacs.d
parent0334d35a78f34d057299a9cd7c08cb1ab8754fbc (diff)
downloaddotfiles-81d5fc817ea5dbfb88e5318ff17d5cda81c9b7c5.tar.gz
dotfiles-81d5fc817ea5dbfb88e5318ff17d5cda81c9b7c5.tar.bz2
dotfiles-81d5fc817ea5dbfb88e5318ff17d5cda81c9b7c5.zip
update emacs config
Diffstat (limited to 'home/.emacs.d')
-rw-r--r--home/.emacs.d/config/navigation.el27
-rw-r--r--home/.emacs.d/init.el5
2 files changed, 27 insertions, 5 deletions
diff --git a/home/.emacs.d/config/navigation.el b/home/.emacs.d/config/navigation.el
index df0e176..80589b4 100644
--- a/home/.emacs.d/config/navigation.el
+++ b/home/.emacs.d/config/navigation.el
@@ -4,8 +4,7 @@
(use-package helm
:config
(progn ; progn since order is important here
- (setq helm-split-window-in-side-p t ; open helm buffer inside current windowA
- helm-candidate-number-limit 100
+ (setq helm-candidate-number-limit 100
helm-quick-update t
helm-M-x-requires-pattern nil
helm-M-x-fuzzy-match t
@@ -38,6 +37,11 @@
:bind (("C-x p" . helm-projectile)
("C-x P" . helm-projectile-grep)))
+(use-package goto-chg
+ :commands goto-last-change
+ :bind (("C-." . goto-last-change)
+ ("C-," . goto-last-change-reverse)))
+
(use-package popup-imenu
:commands popup-imenu
:bind ("M-i" . popup-imenu))
@@ -54,6 +58,21 @@
:bind ("C-x g" . magit-status))
(use-package zoom-frm
- :bind (("C-+" . zoom-frm-in)
- ("C--" . zoom-frm-out)
+ :bind (("C-+" . zoom-all-frames-in)
+ ("C--" . zoom-all-frames-out)
("C-0" . zoom-frm-unzoom)))
+
+(defun unfill-paragraph (&optional region)
+ ;; http://www.emacswiki.org/emacs/UnfillParagraph
+ "Transforms a paragraph in REGION into a single line of text."
+ (interactive)
+ (let ((fill-column (point-max)))
+ (fill-paragraph nil region)))
+(define-key global-map "\M-Q" 'unfill-paragraph)
+
+(defun revert-buffer-no-confirm ()
+ ;; http://www.emacswiki.org/emacs-en/download/misc-cmds.el
+ "Revert buffer without confirmation."
+ (interactive)
+ (revert-buffer t t))
+(global-set-key [f5] 'revert-buffer-no-confirm)
diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index 56494ce..e8e4c82 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -7,7 +7,7 @@
(global-linum-mode t)
(setq column-number-mode t)
(setq inhibit-splash-screen t)
-(setq initial-scratch-message "")
+(setq initial-scratch-message nil)
(setq ring-bell-function 'ignore)
;; disable backups, autosave and lockfiles
@@ -17,6 +17,9 @@
(setq create-lockfiles nil)
(global-auto-revert-mode t)
+;; save customizations to separate file
+(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
+
;; font
(set-face-attribute 'default nil :height 120); value is in 1/10pt, so 100 will give you 10pt, etc.