diff options
| author | Yuchen Pei <id@ypei.org> | 2023-07-05 20:43:34 +1000 |
|---|---|---|
| committer | Yuchen Pei <id@ypei.org> | 2023-07-05 20:43:34 +1000 |
| commit | 4d9ddb8269bbae9ee52d17b5d2ca30745220fe25 (patch) | |
| tree | ae2fd7d47ac9557e669049adcb5186ccc2a73821 /emacs | |
| parent | 37805ccd2a94a57e86a0dc26a703736f881c66e4 (diff) | |
some minor changes
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init/ycp-editing.el | 2 | ||||
| -rw-r--r-- | emacs/.emacs.d/init/ycp-org.el | 3 | ||||
| -rw-r--r-- | emacs/.emacs.d/init/ycp-vc.el | 4 | ||||
| -rw-r--r-- | emacs/.emacs.d/lisp/my/my-buffer.el | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el index 87e42c0..1300ccb 100644 --- a/emacs/.emacs.d/init/ycp-editing.el +++ b/emacs/.emacs.d/init/ycp-editing.el @@ -77,7 +77,7 @@ (advice-add 'find-file-other-window :around 'my-find-file-line-number) ) -(my-package new-comment +(my-package newcomment (add-to-list 'safe-local-variable-values '((comment-style . extra-line) (comment-continue . " ")))) diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el index 25a8a2a..5918513 100644 --- a/emacs/.emacs.d/init/ycp-org.el +++ b/emacs/.emacs.d/init/ycp-org.el @@ -110,6 +110,9 @@ (add-hook 'before-save-hook #'my-org-update-updated) ) +(my-package org-duration + (my-setq-from-local org-duration-units)) + (my-package org-goto (setq org-goto-interface 'outline-path-completion) ) diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el index 57de6f1..4513d45 100644 --- a/emacs/.emacs.d/init/ycp-vc.el +++ b/emacs/.emacs.d/init/ycp-vc.el @@ -71,6 +71,7 @@ (setq ediff-make-buffers-readonly-at-startup nil) (setq ediff-show-clashes-only t) (setq ediff-split-window-function 'split-window-horizontally) + (add-hook 'ediff-before-setup-hook 'my-select-new-frame) (setq ediff-combination-pattern '("<<<<<<< A: HEAD" A "||||||| Ancestor" Ancestor @@ -119,6 +120,9 @@ (require 'magit-repos) (my-setq-from-local magit-repository-directories) (put 'magit-clean 'disabled nil) + + (require 'magit-ediff) + (add-hook 'magit-ediff-quit-hook 'delete-frame) ) (my-package my-magit diff --git a/emacs/.emacs.d/lisp/my/my-buffer.el b/emacs/.emacs.d/lisp/my/my-buffer.el index a8be324..98fd548 100644 --- a/emacs/.emacs.d/lisp/my/my-buffer.el +++ b/emacs/.emacs.d/lisp/my/my-buffer.el @@ -284,6 +284,9 @@ that point." (* (face-attribute 'default :height frame) (expt 1.05 steps)))))) +(defun my-select-new-frame () + (select-frame (make-frame))) + (defun my-decrease-default-face-height (&optional steps) "Decrease the height of the default face by STEPS steps. Each step divides the height by 1.2; a negative number of steps |