diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-26 19:54:59 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-26 19:54:59 +0100 |
| commit | 5c922cc3a4b0677805a678267df2b7598e92bb83 (patch) | |
| tree | f7680e085436621332230c7a46df36ad4048310b /lisp/emacs-lisp/package.el | |
| parent | cedc55041ea5179dcb389845d2d0e3562060cab9 (diff) | |
| parent | 496fa1c03b1b3ce4aa9872751e9fac45167766c2 (diff) | |
| download | emacs-5c922cc3a4b0677805a678267df2b7598e92bb83.tar.gz emacs-5c922cc3a4b0677805a678267df2b7598e92bb83.tar.bz2 emacs-5c922cc3a4b0677805a678267df2b7598e92bb83.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 51895f80273..b7fa3120c10 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -4052,10 +4052,7 @@ The return value is a string (or nil in case we can't find it)." ;; the version at compile time and hardcodes it into the .elc file! (declare (pure t)) ;; Hack alert! - (let ((file - (or (if (boundp 'byte-compile-current-file) byte-compile-current-file) - load-file-name - buffer-file-name))) + (let ((file (or (macroexp-file-name) buffer-file-name))) (cond ((null file) nil) ;; Packages are normally installed into directories named "<pkg>-<vers>", |