procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* lisp.h (merge): ... to here.
This commit is contained in:
Paul Eggert 2013-08-01 23:24:02 +01:00
parent 5f648ab4b0
commit 6318cde023
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

2
src/fileio.c
View file

@ -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)

2
src/fns.c
View file

@ -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.

1
src/lisp.h
View file

@ -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);