aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 00:32:09 +0000
committerErik Naggum1996-01-09 00:32:09 +0000
commite9319ef2ca56dec5a5a0ccbc406ab8dbb3b5e666 (patch)
tree4f867ea2d1452158edda6472bd159de59873bf44 /src
parent3b7f6e604c7d89024a457073f062b00650fd8816 (diff)
downloademacs-e9319ef2ca56dec5a5a0ccbc406ab8dbb3b5e666.tar.gz
emacs-e9319ef2ca56dec5a5a0ccbc406ab8dbb3b5e666.zip
(Flock_buffer, Ffile_locked_p): Harmonize arguments with documentation.
Diffstat (limited to 'src')
-rw-r--r--src/filelock.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/filelock.c b/src/filelock.c
index bda8bede020..8fcc1c03c5a 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -397,16 +397,16 @@ DEFUN ("lock-buffer", Flock_buffer, Slock_buffer,
397 "Lock FILE, if current buffer is modified.\n\ 397 "Lock FILE, if current buffer is modified.\n\
398FILE defaults to current buffer's visited file,\n\ 398FILE defaults to current buffer's visited file,\n\
399or else nothing is done if current buffer isn't visiting a file.") 399or else nothing is done if current buffer isn't visiting a file.")
400 (fn) 400 (file)
401 Lisp_Object fn; 401 Lisp_Object file;
402{ 402{
403 if (NILP (fn)) 403 if (NILP (file))
404 fn = current_buffer->file_truename; 404 file = current_buffer->file_truename;
405 else 405 else
406 CHECK_STRING (fn, 0); 406 CHECK_STRING (file, 0);
407 if (SAVE_MODIFF < MODIFF 407 if (SAVE_MODIFF < MODIFF
408 && !NILP (fn)) 408 && !NILP (file))
409 lock_file (fn); 409 lock_file (file);
410 return Qnil; 410 return Qnil;
411} 411}
412 412
@@ -436,15 +436,15 @@ unlock_buffer (buffer)
436DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0, 436DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0,
437 "Return nil if the FILENAME is not locked,\n\ 437 "Return nil if the FILENAME is not locked,\n\
438t if it is locked by you, else a string of the name of the locker.") 438t if it is locked by you, else a string of the name of the locker.")
439 (fn) 439 (filename)
440 Lisp_Object fn; 440 Lisp_Object filename;
441{ 441{
442 register char *lfname; 442 register char *lfname;
443 int owner; 443 int owner;
444 444
445 fn = Fexpand_file_name (fn, Qnil); 445 filename = Fexpand_file_name (filename, Qnil);
446 446
447 MAKE_LOCK_NAME (lfname, fn); 447 MAKE_LOCK_NAME (lfname, filename);
448 448
449 owner = current_lock_owner (lfname); 449 owner = current_lock_owner (lfname);
450 if (owner <= 0) 450 if (owner <= 0)