From 84f6296af5844c709d004ce9ab135e698dbd21f3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 25 Sep 1996 03:23:03 +0000 Subject: (Vuser_login_name): Declared extern. (minibuf_level): extern decl moved to top level. (Fwrite_region): Query before writing to a file that is locked, even if it is locked by the same user. --- src/fileio.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/fileio.c') diff --git a/src/fileio.c b/src/fileio.c index ab1ec670c8..bd7adb56da 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -183,6 +183,10 @@ int vms_stmlf_recfm; expanding file names. This can be bound to / or \. */ Lisp_Object Vdirectory_sep_char; +extern Lisp_Object Vuser_login_name; + +extern int minibuf_level; + /* These variables describe handlers that have "already" had a chance to handle the current operation. @@ -3515,7 +3519,14 @@ to the file, instead of any buffer contents, and END is ignored.") #ifdef CLASH_DETECTION if (!auto_saving) - lock_file (lockname); + { + /* If we've locked this file for some other buffer, + query before proceeding. */ + if (!visiting && EQ (Ffile_locked_p (lockname), Qt)) + call2 (intern ("ask-user-about-lock"), fn, Vuser_login_name); + + lock_file (lockname); + } #endif /* CLASH_DETECTION */ fn = XSTRING (filename)->data; @@ -4064,7 +4075,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer.") int auto_saved = 0; char *omessage = echo_area_glyphs; int omessage_length = echo_area_glyphs_length; - extern int minibuf_level; int do_handled_files; Lisp_Object oquit; int listdesc; -- cgit v1.2.3