aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrea Corallo2020-09-28 17:20:55 +0200
committerAndrea Corallo2020-09-29 10:05:39 +0200
commita06fe08e8e8177ae3ccd6e2677b40237cd86ae9d (patch)
treea81d76b2d72489326505eab4ef27e8b80c965678 /src
parentdc0cf16c7a60f36aafcf9b56513a855cefa7e1ad (diff)
downloademacs-a06fe08e8e8177ae3ccd6e2677b40237cd86ae9d.tar.gz
emacs-a06fe08e8e8177ae3ccd6e2677b40237cd86ae9d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/lread.c b/src/lread.c
index d32f5755e98..ea31131b755 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1056,25 +1056,8 @@ This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */)
1056 { 1056 {
1057 Lisp_Object exts = Vload_file_rep_suffixes; 1057 Lisp_Object exts = Vload_file_rep_suffixes;
1058 Lisp_Object suffix = XCAR (suffixes); 1058 Lisp_Object suffix = XCAR (suffixes);
1059 bool native_code_suffix = 1059 FOR_EACH_TAIL (exts)
1060 NATIVE_COMP_FLAG 1060 lst = Fcons (concat2 (suffix, XCAR (exts)), lst);
1061 && strcmp (NATIVE_ELISP_SUFFIX, SSDATA (suffix)) == 0;
1062
1063#ifdef HAVE_MODULES
1064 native_code_suffix =
1065 native_code_suffix || strcmp (MODULES_SUFFIX, SSDATA (suffix)) == 0;
1066#ifdef MODULES_SECONDARY_SUFFIX
1067 native_code_suffix =
1068 native_code_suffix
1069 || strcmp (MODULES_SECONDARY_SUFFIX, SSDATA (suffix)) == 0;
1070#endif
1071#endif
1072
1073 if (native_code_suffix)
1074 lst = Fcons (suffix, lst);
1075 else
1076 FOR_EACH_TAIL (exts)
1077 lst = Fcons (concat2 (suffix, XCAR (exts)), lst);
1078 } 1061 }
1079 return Fnreverse (lst); 1062 return Fnreverse (lst);
1080} 1063}
@@ -1698,6 +1681,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
1698 int last_errno = ENOENT; 1681 int last_errno = ENOENT;
1699 int save_fd = -1; 1682 int save_fd = -1;
1700 USE_SAFE_ALLOCA; 1683 USE_SAFE_ALLOCA;
1684
1701 /* The last-modified time of the newest matching file found. 1685 /* The last-modified time of the newest matching file found.
1702 Initialize it to something less than all valid timestamps. */ 1686 Initialize it to something less than all valid timestamps. */
1703 struct timespec save_mtime = make_timespec (TYPE_MINIMUM (time_t), -1); 1687 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,
1898 /* We succeeded; return this descriptor and filename. */ 1882 /* We succeeded; return this descriptor and filename. */
1899 if (storeptr) 1883 if (storeptr)
1900 *storeptr = string; 1884 *storeptr = string;
1901
1902 SAFE_FREE (); 1885 SAFE_FREE ();
1903 return fd; 1886 return fd;
1904 } 1887 }