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/fns.c | |
parent | ab419665caa6e2ad7465cf59ef902cc4ad1d2117 (diff) | |
parent | 2ad0a067728ccc7f8b32b0c3db1677ca351943fe (diff) | |
download | emacs-99191b89ff64172740add88e67f163619a07830c.tar.gz |
Merge from mainline.
Diffstat (limited to 'src/fns.c')
-rw-r--r-- | src/fns.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index 6f81635ab9d..de90fd731fb 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1738,8 +1738,6 @@ See also the function `nreverse', which is used more often. */) return new; } -Lisp_Object merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred); - DEFUN ("sort", Fsort, Ssort, 2, 2, 0, doc: /* Sort LIST, stably, comparing elements using PREDICATE. Returns the sorted list. LIST is modified by side effects. |