summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index bff10003f84..e58f27e7ebc 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1061,7 +1061,12 @@ please check its value")
(unless (file-readable-p lispdir)
(princ (format "Lisp directory %s not readable?" lispdir))
(terpri)))
- (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
+ (setq lisp-dir
+ (file-truename
+ (if (string-match "\\.eln\\'" simple-file-name)
+ (expand-file-name
+ (concat (file-name-directory simple-file-name) "../"))
+ (file-name-directory simple-file-name))))
(setq load-history
(mapcar (lambda (elt)
(if (and (stringp (car elt))