diff options
| author | Stefan Monnier | 2019-07-09 16:13:25 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-07-09 16:13:25 -0400 |
| commit | 3078e6d2fb9b2acf785be11de465f6410acaa5fc (patch) | |
| tree | b64e4e1d395652888af94a38660654711f3e7e03 /src/fns.c | |
| parent | 2391a8e24f2ea1f80661ed29fcc64c02c7d8d95c (diff) | |
| parent | 412139f1be7415791a0d964f95f319c86eded426 (diff) | |
| download | emacs-3078e6d2fb9b2acf785be11de465f6410acaa5fc.tar.gz emacs-3078e6d2fb9b2acf785be11de465f6410acaa5fc.zip | |
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -2984,8 +2984,9 @@ suppressed. */) | |||
| 2984 | Vautoload_queue = Qt; | 2984 | Vautoload_queue = Qt; |
| 2985 | 2985 | ||
| 2986 | /* Load the file. */ | 2986 | /* Load the file. */ |
| 2987 | tem = Fload (NILP (filename) ? Fsymbol_name (feature) : filename, | 2987 | tem = save_match_data_load |
| 2988 | noerror, Qt, Qnil, (NILP (filename) ? Qt : Qnil)); | 2988 | (NILP (filename) ? Fsymbol_name (feature) : filename, |
| 2989 | noerror, Qt, Qnil, (NILP (filename) ? Qt : Qnil)); | ||
| 2989 | 2990 | ||
| 2990 | /* If load failed entirely, return nil. */ | 2991 | /* If load failed entirely, return nil. */ |
| 2991 | if (NILP (tem)) | 2992 | if (NILP (tem)) |