summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-08-29 15:10:37 +0200
committerAndrea Corallo <akrl@sdf.org>2020-08-29 16:08:03 +0200
commit59a40b0d75526c973b5bdd25c41824879aafa515 (patch)
treef9596ee6bd57d2490137b6b416fbf29f18fc8e06 /lisp/startup.el
parent87b9c3e71840f480c2ce05eb51d71156790a5434 (diff)
downloademacs-59a40b0d75526c973b5bdd25c41824879aafa515.tar.gz
emacs-59a40b0d75526c973b5bdd25c41824879aafa515.tar.bz2
emacs-59a40b0d75526c973b5bdd25c41824879aafa515.zip
* lisp/startup.el (command-line): Clean-up logic for new .eln disposition.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 0a81c878af8..e39df7568ca 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1059,12 +1059,7 @@ please check its value")
(unless (file-readable-p lispdir)
(princ (format "Lisp directory %s not readable?" lispdir))
(terpri)))
- (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 lisp-dir (file-truename (file-name-directory simple-file-name)))
(setq load-history
(mapcar (lambda (elt)
(if (and (stringp (car elt))