From: Paul Eggert Date: Thu, 14 Apr 2011 20:20:17 +0000 (-0700) Subject: Fix merge typo. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~289 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd19b04f04532ef0a38a40e37123d03998f18c4a;p=emacs.git Fix merge typo. --- diff --git a/src/fileio.c b/src/fileio.c index b8c5e796db4..dcba6b6c0ae 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -145,7 +145,6 @@ Lisp_Object Qfile_name_history; static Lisp_Object Qcar_less_than_car; static Lisp_Object Fmake_symbolic_link (Lisp_Object, Lisp_Object, Lisp_Object); -static int a_write (int, Lisp_Object, int, int, static int a_write (int, Lisp_Object, EMACS_INT, EMACS_INT, Lisp_Object *, struct coding_system *); static int e_write (int, Lisp_Object, EMACS_INT, EMACS_INT,