emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: merging from main

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-03-30 09:26:10 -04:00
commit 8d5872a067
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/cli/packages.el
View file

@ -319,7 +319,8 @@ list remains lean."
(print-group!
(if-let (pin (cdr (assoc package pinned)))
(print! (item "Pinned to %s") pin)
(print! (item "Checked out %s") commit)))
(when commit
(print! (item "Checked out %s") commit))))
;; HACK: Line encoding issues can plague
;; repos with dirty worktree prompts
;; when updating packages or "Local

2
lisp/cli/sync.el
View file

@ -91,7 +91,7 @@ OPTIONS:
(when (doom-profile-generate)
(print! (item "Restart Emacs or use 'M-x doom/reload' for changes to take effect"))
(run-hooks 'doom-after-sync-hook))
(when (and (not rebuild?) (not nobuild?))
(when (or rebuild? (not (file-exists-p doom-cli-sync-info-file)))
(with-temp-file doom-cli-sync-info-file
(prin1 (cons emacs-version (system-name)) (current-buffer))))
t)