aboutsummaryrefslogtreecommitdiff
path: root/emacs/.emacs.d/init
diff options
context:
space:
mode:
authorYuchen Pei <id@ypei.org>2023-07-03 20:11:53 +1000
committerYuchen Pei <id@ypei.org>2023-07-03 20:11:53 +1000
commite1640aa343f3b7c050ad525b508cea2ee9a48ce4 (patch)
tree59c80d81ec3f9ace008b3993402e2261b274867f /emacs/.emacs.d/init
parent5686d46326931ad67615086c7eaffb2013fae6d9 (diff)
minor changes
Diffstat (limited to 'emacs/.emacs.d/init')
-rw-r--r--emacs/.emacs.d/init/ycp-complete.el5
-rw-r--r--emacs/.emacs.d/init/ycp-editing.el5
-rw-r--r--emacs/.emacs.d/init/ycp-prog.el5
-rw-r--r--emacs/.emacs.d/init/ycp-vc.el9
4 files changed, 18 insertions, 6 deletions
diff --git a/emacs/.emacs.d/init/ycp-complete.el b/emacs/.emacs.d/init/ycp-complete.el
index fefe711..d803d95 100644
--- a/emacs/.emacs.d/init/ycp-complete.el
+++ b/emacs/.emacs.d/init/ycp-complete.el
@@ -183,6 +183,11 @@
(dolist (backend '( cape-symbol cape-keyword cape-file cape-history cape-dabbrev))
(add-to-list 'completion-at-point-functions backend)))
+(my-package imenu
+ (:delay 5)
+ (my-keybind global-map "M-s i" #'imenu)
+ )
+
;;; consult
(my-package consult
(:install t)
diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el
index 351fe2e..87e42c0 100644
--- a/emacs/.emacs.d/init/ycp-editing.el
+++ b/emacs/.emacs.d/init/ycp-editing.el
@@ -77,6 +77,11 @@
(advice-add 'find-file-other-window :around 'my-find-file-line-number)
)
+(my-package new-comment
+ (add-to-list 'safe-local-variable-values
+ '((comment-style . extra-line)
+ (comment-continue . " "))))
+
(setq viper-mode nil)
(my-package viper
(:delay 60))
diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index c6a5610..3426665 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -416,11 +416,6 @@
(:delay 60)
(require 'flycheck-crystal))
-(my-package imenu
- (:delay 5)
- (my-keybind global-map "C-c i" #'imenu)
- )
-
;;; proof-general
(my-package proof-general
(:install t)
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index abd02d1..57de6f1 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -29,6 +29,12 @@
;;; vc, magit, diff
+(my-package vc
+ (:delay 5)
+ ;; A var from newer emacs, in .dir-locals of emacs source
+ (add-to-list 'safe-local-variable-values
+ '(vc-prepare-patches-separately)))
+
(my-package vc-hooks
(:delay 5)
;;; avoid the "file is symlink to git controlled repo, follow?"
@@ -43,7 +49,8 @@
;; 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)))
+ (add-to-list 'safe-local-variable-values
+ '(diff-add-log-use-relative-names . t)))
(my-package ediff
(:delay 30)