diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
| commit | 99191b89ff64172740add88e67f163619a07830c (patch) | |
| tree | 828d1ac7c917076703b9d4a3746ff7480bd97f0d /src/lisp.h | |
| parent | ab419665caa6e2ad7465cf59ef902cc4ad1d2117 (diff) | |
| parent | 2ad0a067728ccc7f8b32b0c3db1677ca351943fe (diff) | |
| download | emacs-99191b89ff64172740add88e67f163619a07830c.tar.gz | |
Merge from mainline.
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 254ead231b9..5daddb7d335 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3302,6 +3302,7 @@ extern struct hash_table_test hashtest_eql, hashtest_equal; extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t); +extern Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object); extern Lisp_Object do_yes_or_no_p (Lisp_Object); extern Lisp_Object concat2 (Lisp_Object, Lisp_Object); extern Lisp_Object concat3 (Lisp_Object, Lisp_Object, Lisp_Object); |