* fileio.c, fns.c (merge): Move extern decl from here ...

* lisp.h (merge): ... to here.

diff --git a/src/ChangeLog b/src/ChangeLog
index abc54196eb05d25ab8f1973789169b4302487acb..c8626802af6bec723e7897286eb5ca5211736e51 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fileio.c, fns.c (merge): Move extern decl from here ...
+       * lisp.h (merge): ... to here.
+
 2013-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Fix last font-related change.

diff --git a/src/fileio.c b/src/fileio.c
index c47b35331457ed2a610967fe1d18513249ecebbf..59e840537737fde6ffa6410026d4ca069c962cb2 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5096,8 +5096,6 @@ This calls `write-region-annotate-functions' at the start, and
   return Qnil;
 }
 \f
-Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object);
-
 DEFUN ("car-less-than-car", Fcar_less_than_car, Scar_less_than_car, 2, 2, 0,
        doc: /* Return t if (car A) is numerically less than (car B).  */)
   (Lisp_Object a, Lisp_Object b)

diff --git a/src/fns.c b/src/fns.c
index 6f81635ab9d5e3fb29ff2b1f41e77ce84cef7799..de90fd731fbe86cef6c127603e14fd88addcdbed 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1738,8 +1738,6 @@ See also the function `nreverse', which is used more often.  */)
   return new;
 }
 \f
-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.

diff --git a/src/lisp.h b/src/lisp.h
index 254ead231b9c7c932ecd2e900d39d47b651eaa7c..5daddb7d3350e033de659e6630a03ff7e8cbc1b9 100644 (file)
--- 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);