diff options
author | Yuchen Pei <id@ypei.org> | 2023-06-17 17:20:29 +1000 |
---|---|---|
committer | Yuchen Pei <id@ypei.org> | 2023-06-17 17:20:29 +1000 |
commit | 093ffa5fbf7143f4668bb0a3dc9659a5cc836e12 (patch) | |
tree | 1ed4e14b2a43b8e338f4ad6a04d969b99b9239be /.emacs.d/init/ycp-vc.el | |
parent | abc686827ae38ee715d9eed1c5c29161c74127e6 (diff) |
Moving things one level deeper
To ease gnu stow usage. Now we can do
stow -t ~ emacs
Diffstat (limited to '.emacs.d/init/ycp-vc.el')
-rw-r--r-- | .emacs.d/init/ycp-vc.el | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/.emacs.d/init/ycp-vc.el b/.emacs.d/init/ycp-vc.el deleted file mode 100644 index 49ef58e..0000000 --- a/.emacs.d/init/ycp-vc.el +++ /dev/null @@ -1,89 +0,0 @@ -;;; ycp-vc.el -- My config for vcs related -*- lexical-binding: t -*- - -;; Copyright (C) 2023 Free Software Foundation. - -;; Author: Yuchen Pei <id@ypei.org> -;; Package-Requires: ((emacs "28.2")) - -;; This file is part of dotfiles. - -;; dotfiles is free software: you can redistribute it and/or modify it under -;; the terms of the GNU Affero General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; dotfiles is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General -;; Public License for more details. - -;; You should have received a copy of the GNU Affero General Public -;; License along with dotfiles. If not, see <https://www.gnu.org/licenses/>. - -;;; Commentary: - -;; My config for vcs related. Covers diff, vc, magit, ediff etc. - -;;; Code: - - - -;;; vc, magit, diff -(my-package vc-hooks - (:delay 5) - ;;; avoid the "file is symlink to git controlled repo, follow?" - (setq vc-follow-symlinks t) -) - -;;;; `diff-mode' -(my-package diff-mode - (setq diff-default-read-only t) - (setq diff-advance-after-apply-hunk t) - (setq diff-update-on-the-fly t) - ;; The following are from Emacs 27.1 - (setq diff-font-lock-prettify t) - (setq diff-font-lock-syntax 'hunk-also) - (add-to-list 'safe-local-variable-values '(diff-add-log-use-relative-names . t))) - -(my-package ediff - (:delay 30) -;;;; `ediff' - (setq ediff-keep-variants nil) - (setq ediff-make-buffers-readonly-at-startup nil) - (setq ediff-show-clashes-only t) - (setq ediff-split-window-function 'split-window-horizontally) - (setq ediff-window-setup-function 'ediff-setup-windows-plain) - ) - -(my-package vc-git - (:delay 30) - (add-to-list 'safe-local-variable-values - '(vc-git-annotate-switches . "-w"))) - -(my-package git-commit - (:install t) - (:delay 30) - (setq git-commit-summary-max-length 50) - (setq git-commit-style-convention-checks '(non-empty-second-line))) - -(my-package magit - (:install t) - (:delay 30) - - (require 'magit-diff) - (setq magit-diff-refine-hunk t) - - (require 'magit-repos) - (my-setq-from-local magit-repository-directories) - (put 'magit-clean 'disabled nil) -) - -(my-package my-magit - (:delay 30) - (my-keybind global-map - "\C-xpM" #'my-project-magit-at)) - -(my-package magit-annex - (:delay 60)) - -(provide 'ycp-vc) |