HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
(Finsert_file_contents): Fix previous change.
[bpt/emacs.git]
/
src
/
fileio.c
diff --git
a/src/fileio.c
b/src/fileio.c
index
6edcf45
..
0956fb9
100644
(file)
--- a/
src/fileio.c
+++ b/
src/fileio.c
@@
-4516,8
+4516,10
@@
actually used. */)
if (inserted == 0)
{
+#ifdef CLASH_DETECTION
if (we_locked_file)
unlock_file (current_buffer->file_truename);
+#endif
Vdeactivate_mark = old_Vdeactivate_mark;
}