From 7290f85cfd35acdee1ed9053627dcdd93c23179f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 27 Jan 2022 03:50:52 +0100 Subject: [PATCH] feat(eval): set load-true-file-name & buffer-file-truename So they are available in evaluated contexts. --- modules/lang/emacs-lisp/autoload.el | 10 +++++----- modules/tools/eval/autoload/eval.el | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index 030fc9563..9cb92f2bb 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -11,11 +11,11 @@ to a pop up buffer." (string-trim-right (condition-case-unless-debug e (let ((result - (let ((buffer-file-name - (buffer-file-name (buffer-base-buffer))) - (doom--current-module - (ignore-errors (doom-module-from-path buffer-file-name))) - (debug-on-error t)) + (let* ((buffer-file-name (buffer-file-name (buffer-base-buffer))) + (buffer-file-truename (file-truename buffer-file-name)) + (doom--current-module + (ignore-errors (doom-module-from-path buffer-file-name))) + (debug-on-error t)) (eval (read (format "(progn %s)" (buffer-substring-no-properties beg end))) lexical-binding)))) diff --git a/modules/tools/eval/autoload/eval.el b/modules/tools/eval/autoload/eval.el index 573329335..4c07e2ea2 100644 --- a/modules/tools/eval/autoload/eval.el +++ b/modules/tools/eval/autoload/eval.el @@ -82,7 +82,11 @@ (defun +eval/region (beg end) "Evaluate a region between BEG and END and display the output." (interactive "r") - (let ((load-file-name buffer-file-name)) + (let ((load-file-name buffer-file-name) + (load-true-file-name + (or buffer-file-truename + (if buffer-file-name + (file-truename buffer-file-name))))) (cond ((and (fboundp '+eval--ensure-in-repl-buffer) (ignore-errors (get-buffer-window (or (+eval--ensure-in-repl-buffer)