diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /src/lisp.h | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 5ea0303976d..7032a3f48f4 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2686,7 +2686,7 @@ extern Lisp_Object make_uninit_multibyte_string P_ ((int, int)); | |||
| 2686 | extern Lisp_Object make_string_from_bytes P_ ((const char *, int, int)); | 2686 | extern Lisp_Object make_string_from_bytes P_ ((const char *, int, int)); |
| 2687 | extern Lisp_Object make_specified_string P_ ((const char *, int, int, int)); | 2687 | extern Lisp_Object make_specified_string P_ ((const char *, int, int, int)); |
| 2688 | EXFUN (Fpurecopy, 1); | 2688 | EXFUN (Fpurecopy, 1); |
| 2689 | extern Lisp_Object make_pure_string P_ ((char *, int, int, int)); | 2689 | extern Lisp_Object make_pure_string P_ ((const char *, int, int, int)); |
| 2690 | extern Lisp_Object make_pure_c_string (const char *data); | 2690 | extern Lisp_Object make_pure_c_string (const char *data); |
| 2691 | extern Lisp_Object pure_cons P_ ((Lisp_Object, Lisp_Object)); | 2691 | extern Lisp_Object pure_cons P_ ((Lisp_Object, Lisp_Object)); |
| 2692 | extern Lisp_Object make_pure_vector P_ ((EMACS_INT)); | 2692 | extern Lisp_Object make_pure_vector P_ ((EMACS_INT)); |