Clean-up some now unnecessary diff against master

	* lisp/emacs-lisp/autoload.el (update-directory-autoloads):
	.eln files have been moved so remove the '.eln' match.

	* lisp/emacs-lisp/bytecomp.el (byte-compile-refresh-preloaded):
	Likewise.

	* lisp/emacs-lisp/find-func.el (find-library-suffixes): Clean-up
	as '.eln' is no more in `load-suffixes'.

	* lisp/help-fns.el (find-lisp-object-file-name): Clean-up as
	`symbol-file' will return the '.elc' file.

	* src/lread.c (Fget_load_suffixes): Remove logic as '.eln' is not
	anymore in load-suffixes.
	(openp): Two spaces.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 4bdbc95081f498da2aa7a6e35973ba62b6d48794..5ee0a14273f73a7fbd1491350dd431c959786f7f 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1047,7 +1047,7 @@ write its autoloads into the specified file instead."
                        ;; we don't want to depend on whether Emacs was
                        ;; built with or without modules support, nor
                        ;; what is the suffix for the underlying OS.
-                      (unless (string-match "\\.\\(elc\\|eln\\|so\\|dll\\)" suf)
+                      (unless (string-match "\\.\\(elc\\|so\\|dll\\)" suf)
                          (push suf tmp)))
                      (concat "\\`[^=.].*" (regexp-opt tmp t) "\\'")))
         (files (apply #'nconc

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4a2a8c62cbc4fe3f42889f74499169323286c78e..b0e3158df323c529d866c660f4bfc85fc84c4ed2 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5180,8 +5180,7 @@ Use with caution."
         (message "Can't find %s to refresh preloaded Lisp files" argv0)
       (dolist (f (reverse load-history))
         (setq f (car f))
-        (when (string-match "el[cn]\\'" f)
-          (setq f (substring f 0 -1)))
+        (if (string-match "elc\\'" f) (setq f (substring f 0 -1)))
         (when (and (file-readable-p f)
                    (file-newer-than-file-p f emacs-file)
                    ;; Don't reload the source version of the files below

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index a4577a53164adf91c7474f6cdd339ffd9c1e0915..9e4d8cf1aa8751324907c67e6f91b6720d31da0e 100644 (file)
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -167,8 +167,7 @@ See the functions `find-function' and `find-variable'."
 (defun find-library-suffixes ()
   (let ((suffixes nil))
     (dolist (suffix (get-load-suffixes) (nreverse suffixes))
-      (unless (string-match "el[cn]" suffix)
-        (push suffix suffixes)))))
+      (unless (string-match "elc" suffix) (push suffix suffixes)))))
 
 (defun find-library--load-name (library)
   (let ((name library))

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 88984ec453e28a3bfb7000eace6dcb1868cc1091..9fee156f18f81e8825e19d2c599fe0759ae0c1fe 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -323,17 +323,12 @@ found via `load-path'.  The return value can also be `C-source', which
 means that OBJECT is a function or variable defined in C.  If no
 suitable file is found, return nil."
   (let* ((autoloaded (autoloadp type))
-        (true-name (or (and autoloaded (nth 1 type))
+        (file-name (or (and autoloaded (nth 1 type))
                        (symbol-file
                          ;; FIXME: Why do we have this weird "If TYPE is the
                          ;; value returned by `symbol-function' for a function
                          ;; symbol" exception?
-                        object (or (if (symbolp type) type) 'defun))))
-         (file-name (if (and true-name
-                             (string-match "[.]eln\\'" true-name))
-                        (gethash (file-name-nondirectory true-name)
-                                 comp-eln-to-el-h)
-                     true-name)))
+                        object (or (if (symbolp type) type) 'defun)))))
     (cond
      (autoloaded
       ;; An autoloaded function: Locate the file since `symbol-function'
@@ -392,7 +387,7 @@ suitable file is found, return nil."
      ((let ((lib-name
             (if (string-match "[.]elc\\'" file-name)
                 (substring-no-properties file-name 0 -1)
-               file-name)))
+              file-name)))
        (or (and (file-readable-p lib-name) lib-name)
            ;; The library might be compressed.
            (and (file-readable-p (concat lib-name ".gz")) lib-name))))

diff --git a/src/lread.c b/src/lread.c
index d32f5755e98a19e575d815bc016c4434287ee0ca..ea31131b75546c703f6e7012349e004263636ee6 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1056,25 +1056,8 @@ This uses the variables `load-suffixes' and `load-file-rep-suffixes'.  */)
     {
       Lisp_Object exts = Vload_file_rep_suffixes;
       Lisp_Object suffix = XCAR (suffixes);
-      bool native_code_suffix =
-       NATIVE_COMP_FLAG
-        && strcmp (NATIVE_ELISP_SUFFIX, SSDATA (suffix)) == 0;
-
-#ifdef HAVE_MODULES
-      native_code_suffix =
-       native_code_suffix || strcmp (MODULES_SUFFIX, SSDATA (suffix)) == 0;
-#ifdef MODULES_SECONDARY_SUFFIX
-      native_code_suffix =
-       native_code_suffix
-       || strcmp (MODULES_SECONDARY_SUFFIX, SSDATA (suffix)) == 0;
-#endif
-#endif
-
-      if (native_code_suffix)
-       lst = Fcons (suffix, lst);
-      else
-        FOR_EACH_TAIL (exts)
-          lst = Fcons (concat2 (suffix, XCAR (exts)), lst);
+      FOR_EACH_TAIL (exts)
+       lst = Fcons (concat2 (suffix, XCAR (exts)), lst);
     }
   return Fnreverse (lst);
 }
@@ -1698,6 +1681,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
   int last_errno = ENOENT;
   int save_fd = -1;
   USE_SAFE_ALLOCA;
+
   /* The last-modified time of the newest matching file found.
      Initialize it to something less than all valid timestamps.  */
   struct timespec save_mtime = make_timespec (TYPE_MINIMUM (time_t), -1);
@@ -1898,7 +1882,6 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
                    /* We succeeded; return this descriptor and filename.  */
                    if (storeptr)
                      *storeptr = string;
-
                    SAFE_FREE ();
                    return fd;
                  }