From b931681d734b5b499db7e7b12c4b5265224fa84b Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 16 Nov 2018 10:52:10 +0000 Subject: [PATCH] Replace magit-gh-pulls package with magithub --- core/siren-modules.el | 1 + modules/version-control/siren-diff-hl.el | 2 ++ modules/version-control/siren-magit.el | 5 ----- modules/version-control/siren-magithub.el | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 modules/version-control/siren-magithub.el diff --git a/core/siren-modules.el b/core/siren-modules.el index 73a549b..472a347 100644 --- a/core/siren-modules.el +++ b/core/siren-modules.el @@ -93,6 +93,7 @@ (require 'siren-git-timemachine) (require 'siren-github) (require 'siren-magit) +(require 'siren-magithub) ;; Window management (require 'siren-buffer-move) diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el index 5b75cb1..c7b9515 100644 --- a/modules/version-control/siren-diff-hl.el +++ b/modules/version-control/siren-diff-hl.el @@ -6,6 +6,8 @@ ;;; Code: +(require 'siren-magit) + (use-package diff-hl :demand :hook ((dired-mode . diff-hl-dired-mode) diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el index fe08fee..a53e2e4 100644 --- a/modules/version-control/siren-magit.el +++ b/modules/version-control/siren-magit.el @@ -47,10 +47,5 @@ ("~/.dotfiles" . 2)) magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1)) -(use-package magit-gh-pulls - :hook (magit-mode . turn-on-magit-gh-pulls) - :config - (setq gh-use-local-git-config t)) - (provide 'siren-magit) ;;; siren-magit.el ends here diff --git a/modules/version-control/siren-magithub.el b/modules/version-control/siren-magithub.el new file mode 100644 index 0000000..7a19470 --- /dev/null +++ b/modules/version-control/siren-magithub.el @@ -0,0 +1,18 @@ +;;; siren-magithub.el --- jimeh's Emacs Siren: magithub configuration + +;;; Commentary: + +;; Basic configuration for magithub. + +;;; Code: + +(require 'siren-magit) + +(use-package magithub + :after magit + :config + (magithub-feature-autoinject t) + (setq magithub-clone-default-directory "~/Projects")) + +(provide 'siren-magithub) +;;; siren-magithub.el ends here