aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2020-12-25 22:44:56 +0100
committerLars Ingebrigtsen2020-12-25 22:44:56 +0100
commitd18b1c8c7583b981d4f3d687e49e82250d51634f (patch)
treea5a680facc7ef5f6b801d60f3bc7cc4e48029780
parent443a53874b8cca1b382509fde1f0f8f70f56e916 (diff)
downloademacs-d18b1c8c7583b981d4f3d687e49e82250d51634f.tar.gz
emacs-d18b1c8c7583b981d4f3d687e49e82250d51634f.zip
Fix package reloading problems on systems with symlinks
* lisp/emacs-lisp/package.el (package--files-load-history): We're comparing the truenames, so ensure that we've using that everywhere. This fixes problems when there's symlinks in the paths.
-rw-r--r--lisp/emacs-lisp/package.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 0170e61e126..bc450b09d01 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -830,7 +830,7 @@ correspond to previously loaded files (those returned by
830 (mapcar (lambda (x) 830 (mapcar (lambda (x)
831 (let ((f (car x))) 831 (let ((f (car x)))
832 (and (stringp f) 832 (and (stringp f)
833 (file-name-sans-extension f)))) 833 (file-name-sans-extension (file-truename f)))))
834 load-history))) 834 load-history)))
835 835
836(defun package--list-of-conflicts (dir history) 836(defun package--list-of-conflicts (dir history)