Commit e9319ef2 authored by Erik Naggum's avatar Erik Naggum
Browse files

(Flock_buffer, Ffile_locked_p): Harmonize arguments with documentation.

parent 3b7f6e60
......@@ -397,16 +397,16 @@ DEFUN ("lock-buffer", Flock_buffer, Slock_buffer,
"Lock FILE, if current buffer is modified.\n\
FILE defaults to current buffer's visited file,\n\
or else nothing is done if current buffer isn't visiting a file.")
Lisp_Object fn;
Lisp_Object file;
if (NILP (fn))
fn = current_buffer->file_truename;
if (NILP (file))
file = current_buffer->file_truename;
CHECK_STRING (file, 0);
&& !NILP (fn))
lock_file (fn);
&& !NILP (file))
lock_file (file);
return Qnil;
......@@ -436,15 +436,15 @@ unlock_buffer (buffer)
DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0,
"Return nil if the FILENAME is not locked,\n\
t if it is locked by you, else a string of the name of the locker.")
Lisp_Object fn;
Lisp_Object filename;
register char *lfname;
int owner;
fn = Fexpand_file_name (fn, Qnil);
filename = Fexpand_file_name (filename, Qnil);
MAKE_LOCK_NAME (lfname, fn);
MAKE_LOCK_NAME (lfname, filename);
owner = current_lock_owner (lfname);
if (owner <= 0)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment