[Emacs-diffs] trunk r113638: * fileio.c, fns.c (merge): Move extern decl from here ...

[Paul Eggert]

------------------------------------------------------------
revno: 113638
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 23:24:02 +0100
message:
  * fileio.c, fns.c (merge): Move extern decl from here ...
  
  * lisp.h (merge): ... to here.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210
  src/fns.c                      fns.c-20091113204419-o5vbwnq5f7feedwu-203
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-01 16:09:20 +0000
+++ b/src/ChangeLog     2013-08-01 22:24:02 +0000
@@ -1,3 +1,8 @@
+2013-08-01  Paul Eggert  <address@hidden>
+
+       * fileio.c, fns.c (merge): Move extern decl from here ...
+       * lisp.h (merge): ... to here.
+
 2013-08-01  Dmitry Antipov  <address@hidden>
 
        Fix last font-related change.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2013-07-25 08:07:47 +0000
+++ b/src/fileio.c      2013-08-01 22:24:02 +0000
@@ -5096,8 +5096,6 @@
   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)

=== modified file 'src/fns.c'
--- a/src/fns.c 2013-07-29 17:28:07 +0000
+++ b/src/fns.c 2013-08-01 22:24:02 +0000
@@ -1738,8 +1738,6 @@
   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.

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-07-19 01:24:35 +0000
+++ b/src/lisp.h        2013-08-01 22:24:02 +0000
@@ -3302,6 +3302,7 @@
 
 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);