From 544d9c8acf55d1af67f6f8d073ac259bcb84fa9e Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 12 Feb 2019 16:26:33 +0000 Subject: [PATCH] Update magit settings --- custom.el | 1 - modules/version-control/siren-magit.el | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/custom.el b/custom.el index 1214739..ed448fc 100644 --- a/custom.el +++ b/custom.el @@ -4,7 +4,6 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(ecb-options-version "2.50") - '(magit-commit-arguments (quote ("-S"))) '(package-selected-packages (quote (zoom-window yasnippet-snippets yari yaml-mode which-key web-mode use-package typescript-mode toggle-quotes tide thrift string-inflection string-edit sqlformat smex smartparens smart-mode-line slim-mode seeing-is-believing scss-mode sass-mode rust-playground ruby-tools ruby-refactor ruby-compilation rubocopfmt rubocop rspec-mode robe rjsx-mode restart-emacs resize-window realgud-byebug rainbow-mode racer prettier-js plantuml-mode php-mode phi-search neotree nav multiple-cursors move-dup magit-gh-pulls lua-mode lsp-ui lsp-mode linum-relative json-mode imenu-anywhere ido-vertical-mode ido-completing-read+ hlinum highlight-symbol highlight-indentation highlight-indent-guides helpful helm-swoop helm-projectile helm-open-github helm-gtags helm-describe-modes helm-descbinds helm-ag groovy-mode go-projectile go-playground go-dlv gitignore-mode github-browse-file gitconfig-mode git-timemachine git-link full-ack flycheck-rust flycheck-gometalinter fill-column-indicator feature-mode expand-region exec-path-from-shell evil eslintd-fix editorconfig dumb-jump doom-themes dockerfile-mode direx diminish diff-hl dash-at-point company-lsp company-go coffee-mode cargo buffer-move browse-kill-ring anzu ace-window)))) diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el index 8b6d65d..e8652ba 100644 --- a/modules/version-control/siren-magit.el +++ b/modules/version-control/siren-magit.el @@ -35,17 +35,19 @@ :config (require 'magit) - (setq magit-completing-read-function 'magit-ido-completing-read - magit-status-buffer-switch-function 'switch-to-buffer - magit-bury-buffer-function 'magit-mode-quit-window + (setq magit-bury-buffer-function 'magit-mode-quit-window + magit-completing-read-function 'magit-ido-completing-read + magit-commit-arguments '("-S") + magit-default-tracking-name-function 'magit-default-tracking-name-branch-only + magit-diff-refine-hunk t + magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1 magit-restore-window-configuration nil magit-revert-buffers 'silent - magit-default-tracking-name-function 'magit-default-tracking-name-branch-only magit-repository-directories '(("~/Projects" . 2) ("~/src" . 1) ("~/.emacs.d" . 0) ("~/.dotfiles" . 2)) - magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1)) + magit-status-buffer-switch-function 'switch-to-buffer)) (provide 'siren-magit) ;;; siren-magit.el ends here