From 6d821dfe181a40e3c8d158dd341fe1f30179f861 Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Fri, 29 Sep 2017 17:53:40 +0200 Subject: [PATCH] Zeuch --- emacs/.emacs | 15 ++++++++++----- vim/.vimrc | 7 +++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/emacs/.emacs b/emacs/.emacs index ab3e03a..f1ec0f1 100644 --- a/emacs/.emacs +++ b/emacs/.emacs @@ -29,9 +29,6 @@ ;; Disable backup (setq make-backup-files nil) -;; Treat underscore as part of word -(modify-syntax-entry ?_ "w") - (push '("melpa" . "http://melpa.milkbox.net/packages/") package-archives) (custom-set-variables @@ -69,7 +66,8 @@ '(shell-pop-window-size 20) '(tool-bar-mode nil) '(dired-listing-switches "-lh") - '(ac-ignore-case nil)) + '(ac-ignore-case nil) + '(show-trailing-whitespace t)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -174,7 +172,8 @@ ac-source-symbols ac-source-features ac-source-words-in-all-buffer - ac-source-dictionary)))) + ac-source-dictionary)) + (global-auto-complete-mode))) ;; ivy (use-package ivy @@ -348,6 +347,12 @@ (set-input-method "latex-german") (local-set-key "\"" 'self-insert-command))) +;; Treat _ as part of word in some modes +(defun treat-underscore () + (modify-syntax-entry ?_ "w")) + +(add-hook 'cperl-mode-hook 'treat-underscore) + ;; Split windows horizontally preferred (setq split-height-threshold 6) (setq split-width-threshold 20) diff --git a/vim/.vimrc b/vim/.vimrc index 50e4ad3..07596bc 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -205,9 +205,9 @@ nnoremap t :g/TODO/ nnoremap :TigStatus " 0 should find first non blank nmap 0 ^ -" Easy buffer switching -nnoremap M :bnext -nnoremap N :bprev +" " Easy buffer switching +" nnoremap M :bnext +" nnoremap N :bprev " Moving through windows nnoremap l nnoremap h @@ -217,7 +217,6 @@ inoremap l inoremap h inoremap j inoremap k -nnoremap K :q " Quick macroing nnoremap Q @@ " --- Don't need a help