projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
filelock.c
diff --git
a/src/filelock.c
b/src/filelock.c
index
308565b
..
3730af2
100644
(file)
--- a/
src/filelock.c
+++ b/
src/filelock.c
@@
-225,7
+225,7
@@
current_lock_owner (lock_info_type *owner, char *lfname)
if (STRINGP (Fsystem_name ())
&& strcmp (owner->host, (char *) XSTRING_DATA (Fsystem_name ())) == 0)
{
if (STRINGP (Fsystem_name ())
&& strcmp (owner->host, (char *) XSTRING_DATA (Fsystem_name ())) == 0)
{
- if (owner->pid == getpid ())
+ if (owner->pid == (unsigned long) getpid ())
ret = 2; /* We own it. */
else if (owner->pid > 0
&& (kill (owner->pid, 0) >= 0 || errno == EPERM))
ret = 2; /* We own it. */
else if (owner->pid > 0
&& (kill (owner->pid, 0) >= 0 || errno == EPERM))
@@
-320,6
+320,7
@@
lock_file (Lisp_Object fn)
return;
XSETBUFFER (old_current_buffer, current_buffer);
return;
XSETBUFFER (old_current_buffer, current_buffer);
+ subject_buf = Qnil;
GCPRO3 (fn, subject_buf, old_current_buffer);
orig_fn = fn;
fn = Fexpand_file_name (fn, Qnil);
GCPRO3 (fn, subject_buf, old_current_buffer);
orig_fn = fn;
fn = Fexpand_file_name (fn, Qnil);