From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Aug 2013 22:24:02 +0000 (+0100)
Subject: * fileio.c, fns.c (merge): Move extern decl from here ...
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1688^2~42
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6318cde023c4ffff777dde20768046e057d85448;p=emacs.git

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

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

diff --git a/src/ChangeLog b/src/ChangeLog
index abc54196eb0..c8626802af6 100644
--- 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 c47b3533145..59e84053773 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5096,8 +5096,6 @@ This calls `write-region-annotate-functions' at the start, and
   return Qnil;
 }
 
-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 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.
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);