Mercurial > emacs
changeset 109543:1f97e508ee42
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 26 Jul 2010 01:23:49 +0000 |
| parents | 3e5d1ad9094d (current diff) 6b02202d9fdc (diff) |
| children | 4a3ef4f17f07 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jul 25 23:02:59 2010 +0000 +++ b/src/ChangeLog Mon Jul 26 01:23:49 2010 +0000 @@ -1,3 +1,7 @@ +2010-07-26 Juanma Barranquero <lekktu@gmail.com> + + * lread.c (unreadpure, mapatoms_1): Make static. + 2010-07-25 Juanma Barranquero <lekktu@gmail.com> * terminfo.c (tparam): Fix prototype of tparm.
--- a/src/lread.c Sun Jul 25 23:02:59 2010 +0000 +++ b/src/lread.c Mon Jul 26 01:23:49 2010 +0000 @@ -1276,7 +1276,6 @@ static Lisp_Object load_unwind (Lisp_Object arg) /* used as unwind-protect function in load */ - { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; if (stream != NULL) @@ -1567,9 +1566,8 @@ Vload_history); } -Lisp_Object +static Lisp_Object unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */ - { read_pure = 0; return Qnil; @@ -3818,7 +3816,7 @@ } } -void +static void mapatoms_1 (Lisp_Object sym, Lisp_Object function) { call1 (function, sym);