diff --git a/core/autoload/projects.el b/core/autoload/projects.el index f3553bbff..6f4f52d17 100644 --- a/core/autoload/projects.el +++ b/core/autoload/projects.el @@ -79,8 +79,8 @@ Returns nil if not in a project." "Return the name of the current project. Returns '-' if not in a valid project." - (if-let* ((project-root (or (doom-project-root dir) - (if dir (expand-file-name dir))))) + (if-let (project-root (or (doom-project-root dir) + (if dir (expand-file-name dir)))) (funcall projectile-project-name-function project-root) "-")) diff --git a/core/autoload/text.el b/core/autoload/text.el index 6d10206c6..cbb4af2f7 100644 --- a/core/autoload/text.el +++ b/core/autoload/text.el @@ -224,7 +224,10 @@ Respects `require-final-newline'." (defvar editorconfig-lisp-use-default-indent) ;;;###autoload (defun doom/set-indent-width (width) - "Change the indentation size to WIDTH of the current buffer." + "Change the indentation size to WIDTH of the current buffer. + +The effectiveness of this command is significantly improved if you have +editorconfig or dtrt-indent installed." (interactive (list (if (integerp current-prefix-arg) current-prefix-arg diff --git a/core/core.el b/core/core.el index b53665bd7..9815b39aa 100644 --- a/core/core.el +++ b/core/core.el @@ -399,8 +399,7 @@ If RETURN-P, return the message as a string instead of displaying it." in interactive sessions, nil otherwise (but logs a warning)." (condition-case e (let (command-switch-alist) - (load (if noninteractive file (file-name-sans-extension file)) - 'noerror 'nomessage)) + (load (substring file 0 -3) 'noerror 'nomessage)) ((debug error) (if noninteractive (message "Autoload file warning: %s -> %s" (car e) (error-message-string e)) diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index 89a38ee7e..39bb007cd 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -56,6 +56,7 @@ called.") "Use the correct Python executables for Flycheck." (let ((executable python-shell-interpreter)) (save-excursion + (goto-char (point-min)) (save-match-data (when (or (looking-at "#!/usr/bin/env \\(python[^ \n]+\\)") (looking-at "#!\\([^ \n]+/python[^ \n]+\\)")) diff --git a/modules/tools/direnv/config.el b/modules/tools/direnv/config.el index 1993d8d26..1534d1698 100644 --- a/modules/tools/direnv/config.el +++ b/modules/tools/direnv/config.el @@ -8,7 +8,7 @@ "TODO") (use-package! direnv - :after-call (after-find-file dired-initial-position-hook) + :after-call after-find-file dired-initial-position-hook :config (add-hook! 'direnv-mode-hook (defun +direnv-init-h ()