diff options
| author | Rasmus | 2017-09-29 10:41:51 +0200 |
|---|---|---|
| committer | Rasmus | 2017-09-29 10:41:51 +0200 |
| commit | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch) | |
| tree | dc92eb83d4a66f112e3688ad10632e14ca6601ff /src/lisp.h | |
| parent | eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff) | |
| parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
| download | emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.zip | |
Merge branch 'emacs-26' into scratch/org-mode-merge
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index c5030824427..0c3ca3ae06b 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3969,6 +3969,7 @@ extern _Noreturn void time_overflow (void); | |||
| 3969 | extern Lisp_Object make_buffer_string (ptrdiff_t, ptrdiff_t, bool); | 3969 | extern Lisp_Object make_buffer_string (ptrdiff_t, ptrdiff_t, bool); |
| 3970 | extern Lisp_Object make_buffer_string_both (ptrdiff_t, ptrdiff_t, ptrdiff_t, | 3970 | extern Lisp_Object make_buffer_string_both (ptrdiff_t, ptrdiff_t, ptrdiff_t, |
| 3971 | ptrdiff_t, bool); | 3971 | ptrdiff_t, bool); |
| 3972 | extern Lisp_Object styled_format (ptrdiff_t, Lisp_Object *, bool, bool); | ||
| 3972 | extern void init_editfns (bool); | 3973 | extern void init_editfns (bool); |
| 3973 | extern void syms_of_editfns (void); | 3974 | extern void syms_of_editfns (void); |
| 3974 | 3975 | ||