From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 31 Dec 1993 18:16:16 +0000 (+0000)
Subject: (Finsert_file_contents): Avoid setting buffer-file-name field if ran a handler.
X-Git-Tag: emacs-19.34~10456
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7e8247287d006c4425737f219f15276a6a2cd17;p=emacs.git

(Finsert_file_contents): Avoid setting buffer-file-name field if ran a handler.
Get rid of local var `handled'.
---

diff --git a/src/fileio.c b/src/fileio.c
index a71d4a17d03..9b196c2a87a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2394,7 +2394,6 @@ If VISIT is non-nil, BEG and END must be nil.")
   Lisp_Object handler, val, insval;
   Lisp_Object p;
   int total;
-  int handled = 0;
 
   val = Qnil;
   p = Qnil;
@@ -2412,7 +2411,6 @@ If VISIT is non-nil, BEG and END must be nil.")
   if (!NILP (handler))
     {
       val = call5 (handler, Qinsert_file_contents, filename, visit, beg, end);
-      handled = 1;
       goto handled;
     }
 
@@ -2544,8 +2542,11 @@ If VISIT is non-nil, BEG and END must be nil.")
       stat (XSTRING (filename)->data, &st);
 #endif
 
-      if (! handled)
-	current_buffer->modtime = st.st_mtime;
+      if (NILP (handler))
+	{
+	  current_buffer->modtime = st.st_mtime;
+	  current_buffer->filename = filename;
+	}
 
       current_buffer->save_modified = MODIFF;
       current_buffer->auto_save_modified = MODIFF;
@@ -2558,7 +2559,6 @@ If VISIT is non-nil, BEG and END must be nil.")
 	  unlock_file (filename);
 	}
 #endif /* CLASH_DETECTION */
-      current_buffer->filename = filename;
       /* If visiting nonexistent file, return nil.  */
       if (current_buffer->modtime == -1)
 	report_file_error ("Opening input file", Fcons (filename, Qnil));