summaryrefslogtreecommitdiff
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el18
1 files changed, 0 insertions, 18 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b01a9802..1070b8b1 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -305,9 +305,6 @@ windows side-by-side in the frame."
'(log-edit-insert-message-template log-edit-insert-cvs-template
log-edit-insert-changelog
spw/log-edit-show-diff) nil nil "Drop log-edit-show-files to avoid its window becoming most recently used for C-x o.")
- '(magit-define-global-key-bindings nil)
- '(magit-diff-refine-hunk 'all)
- '(magit-save-repository-buffers nil)
'(mail-envelope-from 'header nil nil "Bypass MTA rewriting user@localhost.")
'(mail-specify-envelope-from t nil nil "Bypass MTA rewriting user@localhost.")
'(mail-user-agent 'gnus-user-agent)
@@ -1013,9 +1010,6 @@ To be used only when it seems to be necessary."
(setq auto-revert-use-notify nil)
(global-auto-revert-mode 1)
-;; Work around lack of <https://github.com/magit/magit/pull/4591>.
-(setq magit-auto-revert-mode nil)
-
;; C-x x g should not ask for confirmation.
(global-set-key "\C-xxg" (lambda ()
(interactive)
@@ -4005,16 +3999,6 @@ unread."
;;;; VC
-;;; Want Magit installed for `git-commit-mode', `git-rebase-mode' and these
-;;; reflog commands. Otherwise, I prefer how VC is more buffer-oriented, such
-;;; as in eschewing the (singular) Git staging area for `diff-mode' buffers.
-
-(require 'git-commit nil t)
-
-(global-set-key "\C-cvr" #'magit-reflog-current)
-(global-set-key "\C-cvH" #'magit-reflog-head)
-(global-set-key "\C-cvO" #'magit-reflog-other)
-
(spw/when-library-available mailscripts
(global-set-key "\C-cvm" #'spw/mailscripts-prepare-patch)
;; Want a dedicated binding for this because often need it with Debian BTS.
@@ -4025,8 +4009,6 @@ unread."
"vt" notmuch-extract-thread-patches-to-project
"vw" mailscripts-extract-message-patches-to-project))
-(spw/reclaim-keys-from magit magit-mode-map "\M-w")
-
;; Emacs 30: move into `custom-set-variables'.
(when (>= emacs-major-version 30)
(setopt vc-git-log-switches '("--format=fuller" "--stat")))