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/lread.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/lread.c')
| -rw-r--r-- | src/lread.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lread.c b/src/lread.c index e06eafcf6cf..3152fcf867d 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1508,6 +1508,17 @@ Return t if the file exists and loads successfully. */) | |||
| 1508 | 1508 | ||
| 1509 | return Qt; | 1509 | return Qt; |
| 1510 | } | 1510 | } |
| 1511 | |||
| 1512 | Lisp_Object | ||
| 1513 | save_match_data_load (Lisp_Object file, Lisp_Object noerror, | ||
| 1514 | Lisp_Object nomessage, Lisp_Object nosuffix, | ||
| 1515 | Lisp_Object must_suffix) | ||
| 1516 | { | ||
| 1517 | ptrdiff_t count = SPECPDL_INDEX (); | ||
| 1518 | record_unwind_save_match_data (); | ||
| 1519 | Lisp_Object result = Fload (file, noerror, nomessage, nosuffix, must_suffix); | ||
| 1520 | return unbind_to (count, result); | ||
| 1521 | } | ||
| 1511 | 1522 | ||
| 1512 | static bool | 1523 | static bool |
| 1513 | complete_filename_p (Lisp_Object pathname) | 1524 | complete_filename_p (Lisp_Object pathname) |