mirror of
https://codeberg.org/scip/dot-emacs.git
synced 2025-12-17 12:30:59 +01:00
magit doesnt work on w32
This commit is contained in:
33
.emacs
33
.emacs
@@ -1,4 +1,4 @@
|
|||||||
;; Toms Emacs Config - portable - version (20170730.01) -*-emacs-lisp-*-
|
;; Toms Emacs Config - portable - version (20170731.01) -*-emacs-lisp-*-
|
||||||
;; * Introduction
|
;; * Introduction
|
||||||
|
|
||||||
;; This is my emacs config, it is more than twenty years old. It
|
;; This is my emacs config, it is more than twenty years old. It
|
||||||
@@ -587,6 +587,9 @@
|
|||||||
;; 20170730.01
|
;; 20170730.01
|
||||||
;; - +some magit navigation keys
|
;; - +some magit navigation keys
|
||||||
|
|
||||||
|
;; 20170731.01
|
||||||
|
;; - do not load magit on w32
|
||||||
|
|
||||||
;; ** TODO
|
;; ** TODO
|
||||||
|
|
||||||
;; - check helpful https://github.com/wilfred/helpful
|
;; - check helpful https://github.com/wilfred/helpful
|
||||||
@@ -615,7 +618,7 @@
|
|||||||
;; My emacs config has a version (consisting of a timestamp with a
|
;; My emacs config has a version (consisting of a timestamp with a
|
||||||
;; serial), which I display in the mode line. So I can clearly see, if
|
;; serial), which I display in the mode line. So I can clearly see, if
|
||||||
;; I'm using an outdated config somewhere.
|
;; I'm using an outdated config somewhere.
|
||||||
(defvar tvd-emacs-version "20170730.01")
|
(defvar tvd-emacs-version "20170731.01")
|
||||||
|
|
||||||
;; --------------------------------------------------------------------------------
|
;; --------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -4394,14 +4397,14 @@ defun."
|
|||||||
;; *** Magit
|
;; *** Magit
|
||||||
|
|
||||||
;; Not much to say about Magit
|
;; Not much to say about Magit
|
||||||
|
(unless tvd-win-home
|
||||||
|
(setq tvd-magit-revision "20170725.1153")
|
||||||
|
|
||||||
(setq tvd-magit-revision "20170725.1153")
|
(add-to-list 'load-path (concat tvd-lisp-dir (concat "/magit-" tvd-magit-revision)))
|
||||||
|
|
||||||
(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
|
||||||
(expand-file-name (concat "~/.emacs.d/lisp/magit-"
|
(expand-file-name (concat "~/.emacs.d/lisp/magit-"
|
||||||
@@ -4409,11 +4412,11 @@ defun."
|
|||||||
"/Documentation/")))
|
"/Documentation/")))
|
||||||
(setq magit-view-git-manual-method 'woman))
|
(setq magit-view-git-manual-method 'woman))
|
||||||
|
|
||||||
(defalias 'git 'magit-status)
|
(defalias 'git 'magit-status)
|
||||||
(defalias 'gitlog 'magit-log-buffer-file)
|
(defalias 'gitlog 'magit-log-buffer-file)
|
||||||
|
|
||||||
;; configure magit
|
;; configure magit
|
||||||
(with-eval-after-load 'magit
|
(with-eval-after-load 'magit
|
||||||
(dolist (dir (list (expand-file-name "~/D/github")
|
(dolist (dir (list (expand-file-name "~/D/github")
|
||||||
(expand-file-name "~/dev/git")))
|
(expand-file-name "~/dev/git")))
|
||||||
(when (file-exists-p dir)
|
(when (file-exists-p dir)
|
||||||
@@ -4427,10 +4430,10 @@ defun."
|
|||||||
(define-key magit-mode-map (kbd "<C-M-up>") 'magit-section-backward-sibling)
|
(define-key magit-mode-map (kbd "<C-M-up>") 'magit-section-backward-sibling)
|
||||||
(define-key magit-mode-map (kbd "<delete>") 'magit-delete-thing))
|
(define-key magit-mode-map (kbd "<delete>") 'magit-delete-thing))
|
||||||
|
|
||||||
;; one thing though: on startup it bitches about git version, but it
|
;; one thing though: on startup it bitches about git version, but it
|
||||||
;; works nevertheless. So I disable this specific warning.
|
;; works nevertheless. So I disable this specific warning.
|
||||||
|
|
||||||
(defun tvd-ignore-magit-warnings-if-any ()
|
(defun tvd-ignore-magit-warnings-if-any ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(when (get-buffer "*Warnings*")
|
(when (get-buffer "*Warnings*")
|
||||||
(with-current-buffer "*Warnings*"
|
(with-current-buffer "*Warnings*"
|
||||||
@@ -4438,7 +4441,7 @@ defun."
|
|||||||
(when (re-search-forward "Magit requires Git >=")
|
(when (re-search-forward "Magit requires Git >=")
|
||||||
(kill-buffer-and-window)))))
|
(kill-buffer-and-window)))))
|
||||||
|
|
||||||
(add-hook 'after-init-hook 'tvd-ignore-magit-warnings-if-any t)
|
(add-hook 'after-init-hook 'tvd-ignore-magit-warnings-if-any t))
|
||||||
|
|
||||||
;; HINT: how to add a popup action:
|
;; HINT: how to add a popup action:
|
||||||
;; (magit-define-popup-action 'magit-commit-popup
|
;; (magit-define-popup-action 'magit-commit-popup
|
||||||
|
|||||||
1311
emacs.html
1311
emacs.html
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user