* lisp/startup.el (command-line): Clean-up logic for new .eln disposition.

diff --git a/lisp/startup.el b/lisp/startup.el
index 0a81c878af8a3c1303a7d2307c00c840bacbb9ab..e39df7568caf8fdc9d495a9b50237b37bc90df00 100644 (file)
--- 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))