This commit is contained in:
Thomas von Dein
2017-07-28 18:51:00 +02:00
parent 038a4e3a68
commit 8959353a48
2 changed files with 460 additions and 450 deletions

9
.emacs
View File

@@ -757,7 +757,6 @@
(add-to-list 'load-path (concat tvd-lisp-dir "/er")) (add-to-list 'load-path (concat tvd-lisp-dir "/er"))
(add-to-list 'load-path (concat tvd-lisp-dir "/org/lisp")) (add-to-list 'load-path (concat tvd-lisp-dir "/org/lisp"))
(add-to-list 'load-path (concat tvd-lisp-dir "/doremi")) (add-to-list 'load-path (concat tvd-lisp-dir "/doremi"))
(add-to-list 'load-path (concat tvd-lisp-dir "/magit-20170725.1153"))
(add-to-list 'load-path (concat tvd-lisp-dir "/org/contrib/lisp")) (add-to-list 'load-path (concat tvd-lisp-dir "/org/contrib/lisp"))
;; -------------------------------------------------------------------------------- ;; --------------------------------------------------------------------------------
@@ -4393,12 +4392,18 @@ defun."
;; Not much to say about Magit ;; Not much to say about Magit
(setq tvd-magit-revision "20170725.1153")
(add-to-list 'load-path (concat tvd-lisp-dir (concat "/magit-" tvd-magit-revision)))
(require 'magit) (require 'magit)
(with-eval-after-load 'info (with-eval-after-load 'info
(info-initialize) (info-initialize)
(add-to-list 'Info-directory-list (add-to-list 'Info-directory-list
"~/.emacs.d/lisp/magit/Documentation/") (expand-file-name (concat "~/.emacs.d/lisp/magit-"
tvd-magit-revision
"/Documentation/")))
(setq magit-view-git-manual-method 'woman)) (setq magit-view-git-manual-method 'woman))
(defalias 'git 'magit-status) (defalias 'git 'magit-status)

File diff suppressed because it is too large Load Diff