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

dev: merge branch 'master'

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-07-08 09:03:24 -04:00
commit ad8f5470b0
39 changed files with 433 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cli/packages.el
View file

@ -769,7 +769,7 @@ original state.")
(let ((doom-output-indent 0))
(terpri)
(print! (warn "Aborted")))
(doom-cli--exit 1))
(doom-cli--exit 1 doom-cli--context))
(nreverse options)))
(prompt
(format! "How to proceed? (%s%s) "

4
lisp/lib/fonts.el
View file

@ -177,4 +177,6 @@ Also resizees `doom-variable-pitch-font' and `doom-serif-font'."
(font-get (doom-normalize-font doom-big-font) :size))
t `((doom-font . ,doom-big-font)))
;; Resize the current font
(doom-adjust-font-size (if doom-big-font-mode doom-big-font-increment))))
(doom-adjust-font-size nil)
(when doom-big-font-mode
(doom-adjust-font-size doom-big-font-increment))))

5
lisp/lib/projects.el
View file

@ -152,11 +152,12 @@ If DIR is not a project, it will be indexed (but not cached)."
((and (bound-and-true-p ivy-mode)
(fboundp 'counsel-file-jump))
(call-interactively #'counsel-file-jump))
((when-let ((pr (project-current nil dir)))
(project-find-file-in nil nil pr)))
((and (bound-and-true-p helm-mode)
(fboundp 'helm-find-files))
(call-interactively #'helm-find-files))
((when-let ((project-current-directory-override t)
(pr (project-current t dir)))
(project-find-file-in nil nil pr)))
((call-interactively #'find-file)))))
;;;###autoload