diff options
| author | jave | 2014-12-31 12:24:10 +0100 |
|---|---|---|
| committer | jave | 2014-12-31 12:24:10 +0100 |
| commit | baba9e039136e183e055169ddd7ca1e983fc734f (patch) | |
| tree | 9168fb077980351a25ea3a112f2abd105a11099a /src/filelock.c | |
| parent | 4105b6a93047045553e10795742a808b805c85b7 (diff) | |
| parent | 25346768fac53687c97c213fb99ff18fa805b073 (diff) | |
| download | emacs-baba9e039136e183e055169ddd7ca1e983fc734f.tar.gz emacs-baba9e039136e183e055169ddd7ca1e983fc734f.zip | |
merge upstream
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/filelock.c b/src/filelock.c index f857c488143..99215f215e7 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -592,9 +592,10 @@ current_lock_owner (lock_info_type *owner, char *lfname) | |||
| 592 | return -1; | 592 | return -1; |
| 593 | 593 | ||
| 594 | /* On current host? */ | 594 | /* On current host? */ |
| 595 | if (STRINGP (Vsystem_name) | 595 | Lisp_Object system_name = Fsystem_name (); |
| 596 | && dot - (at + 1) == SBYTES (Vsystem_name) | 596 | if (STRINGP (system_name) |
| 597 | && memcmp (at + 1, SSDATA (Vsystem_name), SBYTES (Vsystem_name)) == 0) | 597 | && dot - (at + 1) == SBYTES (system_name) |
| 598 | && memcmp (at + 1, SSDATA (system_name), SBYTES (system_name)) == 0) | ||
| 598 | { | 599 | { |
| 599 | if (pid == getpid ()) | 600 | if (pid == getpid ()) |
| 600 | ret = 2; /* We own it. */ | 601 | ret = 2; /* We own it. */ |