diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:20:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:20:17 -0700 |
| commit | dd19b04f04532ef0a38a40e37123d03998f18c4a (patch) | |
| tree | 438c4285220771ba7a6860b17d2e0bb17ad8bdb1 /src | |
| parent | 8bd7b8304a41da5dc0c8a11967c1a6005e9465d0 (diff) | |
| download | emacs-dd19b04f04532ef0a38a40e37123d03998f18c4a.tar.gz emacs-dd19b04f04532ef0a38a40e37123d03998f18c4a.tar.bz2 emacs-dd19b04f04532ef0a38a40e37123d03998f18c4a.zip | |
Fix merge typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |