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

Fix #3272: void-variable args regression

Browse source
This commit is contained in:
Henrik Lissner 2020-06-01 21:02:36 -04:00
parent e217d770e8
commit 6a85417e8e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/core-modules.el
View file

@ -357,15 +357,16 @@ This value is cached. If REFRESH-P, then don't use the cached value."
;; HACK Fix `:load-path' so it resolves relative paths to the containing file, ;; HACK Fix `:load-path' so it resolves relative paths to the containing file,
;; rather than `user-emacs-directory'. This is a done as a convenience ;; rather than `user-emacs-directory'. This is a done as a convenience
;; for users, wanting to specify a local directory. ;; for users, wanting to specify a local directory.
(defadvice! doom--resolve-load-path-from-containg-file-a (orig-fn _label arg &optional _recursed) (defadvice! doom--resolve-load-path-from-containg-file-a (orig-fn &rest args)
"Resolve :load-path from the current directory." "Resolve :load-path from the current directory."
:around #'use-package-normalize-paths :around #'use-package-normalize-paths
(if (and (stringp arg) (not (file-name-absolute-p arg))) (let ((arg (cadr args)))
;; `use-package-normalize-paths' resolves relative paths from (if (and (stringp arg) (not (file-name-absolute-p arg)))
;; `user-emacs-directory', so just change that. ;; `use-package-normalize-paths' resolves relative paths from
(let ((user-emacs-directory (dir!))) ;; `user-emacs-directory', so just change that.
(funcall orig-fn args)) (let ((user-emacs-directory (dir!)))
(funcall orig-fn args))) (apply orig-fn args))
(apply orig-fn args))))
;; Adds two keywords to `use-package' to expand its lazy-loading capabilities: ;; Adds two keywords to `use-package' to expand its lazy-loading capabilities:
;; ;;