Minor refactor & comment revision across the board
This commit is contained in:
parent
31c95042c3
commit
d297dc6934
7 changed files with 10 additions and 9 deletions
|
@ -313,7 +313,7 @@ them,and remove unnecessary `provide' statements or blank links."
|
||||||
(unless (member pkg doom-autoload-excluded-packages)
|
(unless (member pkg doom-autoload-excluded-packages)
|
||||||
(let ((file (straight--autoloads-file pkg)))
|
(let ((file (straight--autoloads-file pkg)))
|
||||||
(when (file-exists-p file)
|
(when (file-exists-p file)
|
||||||
(insert-file-contents-literally file)
|
(insert-file-contents file)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(while (re-search-forward "\\(?:\\_<load-file-name\\|#\\$\\)\\_>" nil t)
|
(while (re-search-forward "\\(?:\\_<load-file-name\\|#\\$\\)\\_>" nil t)
|
||||||
;; `load-file-name' is meaningless in a concatenated
|
;; `load-file-name' is meaningless in a concatenated
|
||||||
|
|
|
@ -94,7 +94,7 @@ c) are not valid projectile projects."
|
||||||
(let ((default-directory "~"))
|
(let ((default-directory "~"))
|
||||||
(when (cl-find-if #'projectile-file-exists-p
|
(when (cl-find-if #'projectile-file-exists-p
|
||||||
projectile-project-root-files-bottom-up)
|
projectile-project-root-files-bottom-up)
|
||||||
(message "HOME appears to be a project. Disabling bottom-up root search.")
|
(doom-log "HOME appears to be a project. Disabling bottom-up root search.")
|
||||||
(setq projectile-project-root-files
|
(setq projectile-project-root-files
|
||||||
(append projectile-project-root-files-bottom-up
|
(append projectile-project-root-files-bottom-up
|
||||||
projectile-project-root-files)
|
projectile-project-root-files)
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
;;; Indentation detection
|
;;; Indentation detection
|
||||||
|
|
||||||
(defun +fold--hideshow-empty-line-p (_)
|
(defun +fold--hideshow-empty-line-p (_)
|
||||||
(string= "" (string-trim (thing-at-point 'line))))
|
(string= "" (string-trim (thing-at-point 'line 'no-props))))
|
||||||
|
|
||||||
(defun +fold--hideshow-geq-or-empty-p (base-indent)
|
(defun +fold--hideshow-geq-or-empty-p (base-indent)
|
||||||
(or (+fold--hideshow-empty-line-p base-indent)
|
(or (+fold--hideshow-empty-line-p base-indent)
|
||||||
|
|
|
@ -30,7 +30,7 @@ This is ignored by ccls.")
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Packages
|
;;; Packages
|
||||||
|
|
||||||
(use-package! cc-mode
|
(use-package! cc-mode
|
||||||
:commands (c-mode c++-mode objc-mode java-mode)
|
:commands (c-mode c++-mode objc-mode java-mode)
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
(setq sly-mrepl-history-file-name (concat doom-cache-dir "sly-mrepl-history")
|
(setq sly-mrepl-history-file-name (concat doom-cache-dir "sly-mrepl-history")
|
||||||
sly-kill-without-query-p t
|
sly-kill-without-query-p t
|
||||||
sly-net-coding-system 'utf-8-unix
|
sly-net-coding-system 'utf-8-unix
|
||||||
;; Change this to `sly-flex-completions' for fuzzy completion
|
;; Doom defaults to non-fuzzy search, because it is slower and less
|
||||||
|
;; precise. Change this to `sly-flex-completions' for fuzzy completion
|
||||||
sly-complete-symbol-function 'sly-simple-completions)
|
sly-complete-symbol-function 'sly-simple-completions)
|
||||||
|
|
||||||
(set-popup-rules!
|
(set-popup-rules!
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
(doom-spacegrey)
|
(doom-spacegrey)
|
||||||
(doom-vibrant)
|
(doom-vibrant)
|
||||||
(doom-tomorrow-night))
|
(doom-tomorrow-night))
|
||||||
"An alist of themes that support `solaire-mode'. If CDR is t, then use
|
"An alist of themes that support `solaire-mode'. If CDR is t, then
|
||||||
`solaire-mode-swap-bg'.")
|
`solaire-mode-swap-bg' will be used automatically, when the theme is loaded.")
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Packages
|
;;; Packages
|
||||||
|
|
||||||
;; <https://github.com/hlissner/emacs-doom-theme>
|
;; <https://github.com/hlissner/emacs-doom-theme>
|
||||||
(use-package! doom-themes
|
(use-package! doom-themes
|
||||||
|
|
|
@ -251,7 +251,7 @@ workspace to delete."
|
||||||
(user-error "Can't close workspace, it's visible in another frame"))
|
(user-error "Can't close workspace, it's visible in another frame"))
|
||||||
((not (equal (+workspace-current-name) name))
|
((not (equal (+workspace-current-name) name))
|
||||||
(+workspace-delete name))
|
(+workspace-delete name))
|
||||||
((> (length workspaces) 1)
|
((cdr workspaces)
|
||||||
(+workspace-delete name)
|
(+workspace-delete name)
|
||||||
(+workspace-switch
|
(+workspace-switch
|
||||||
(if (+workspace-exists-p +workspace--last)
|
(if (+workspace-exists-p +workspace--last)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue