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/lisp.h | |
| 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/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index 8acf63fe227..fa57cad8a60 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -4019,6 +4019,8 @@ LOADHIST_ATTACH (Lisp_Object x) | |||
| 4019 | if (initialized) | 4019 | if (initialized) |
| 4020 | Vcurrent_load_list = Fcons (x, Vcurrent_load_list); | 4020 | Vcurrent_load_list = Fcons (x, Vcurrent_load_list); |
| 4021 | } | 4021 | } |
| 4022 | extern Lisp_Object save_match_data_load (Lisp_Object, Lisp_Object, Lisp_Object, | ||
| 4023 | Lisp_Object, Lisp_Object); | ||
| 4022 | extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, | 4024 | extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, |
| 4023 | Lisp_Object *, Lisp_Object, bool); | 4025 | Lisp_Object *, Lisp_Object, bool); |
| 4024 | enum { S2N_IGNORE_TRAILING = 1 }; | 4026 | enum { S2N_IGNORE_TRAILING = 1 }; |