aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1997-07-12 06:43:08 +0000
committerRichard M. Stallman1997-07-12 06:43:08 +0000
commitbffd00b0d357087cfa965a0cf7c3cfbf172b39a5 (patch)
tree4ba0751852a13289972f7463159f75162fded7af /src
parent4dcb3ee353fda3654ee0350875938573632943cb (diff)
downloademacs-bffd00b0d357087cfa965a0cf7c3cfbf172b39a5.tar.gz
emacs-bffd00b0d357087cfa965a0cf7c3cfbf172b39a5.zip
(Fwrite_region): Fix call2 argument.
(Fread_file_name): Convert Fcons argument to Lisp_Integer.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 5d9352ed754..bf1af48efc7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,5 +1,5 @@
1/* File IO for GNU Emacs. 1/* File IO for GNU Emacs.
2 Copyright (C) 1985,86,87,88,93,94,95,96 Free Software Foundation, Inc. 2 Copyright (C) 1985,86,87,88,93,94,95,96,1997 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -3909,7 +3909,7 @@ to the file, instead of any buffer contents, and END is ignored.")
3909 /* If we've locked this file for some other buffer, 3909 /* If we've locked this file for some other buffer,
3910 query before proceeding. */ 3910 query before proceeding. */
3911 if (!visiting && EQ (Ffile_locked_p (lockname), Qt)) 3911 if (!visiting && EQ (Ffile_locked_p (lockname), Qt))
3912 call2 (intern ("ask-user-about-lock"), fn, Vuser_login_name); 3912 call2 (intern ("ask-user-about-lock"), filename, Vuser_login_name);
3913 3913
3914 lock_file (lockname); 3914 lock_file (lockname);
3915 } 3915 }
@@ -4853,7 +4853,7 @@ DIR defaults to current buffer's directory default.")
4853 else if (STRINGP (initial)) 4853 else if (STRINGP (initial))
4854 { 4854 {
4855 insdef = initial; 4855 insdef = initial;
4856 insdef1 = Fcons (double_dollars (insdef), 0); 4856 insdef1 = Fcons (double_dollars (insdef), make_number (0));
4857 } 4857 }
4858 else 4858 else
4859 insdef = Qnil, insdef1 = Qnil; 4859 insdef = Qnil, insdef1 = Qnil;