2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c134e589c30..7c7683a5f82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (file-name-non-special): Wrap the call of
+        `insert-file-contents' by `unwind-protect', in order to set the
+        buffer's file name anyway.  (Bug#18891)
+
 2014-11-07  Daiki Ueno  <ueno@gnu.org>
 
         * epg.el (epg--list-keys-1): Ignore fields after the 15th field
diff --git a/lisp/files.el b/lisp/files.el
index 5ed5f8a6e1e..edcb459e26d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6664,7 +6664,7 @@ only these files will be asked to be saved."
       (`add (concat "/:" (apply operation arguments)))
       (`insert-file-contents
        (let ((visit (nth 1 arguments)))
-         (prog1
+         (unwind-protect
              (apply operation arguments)
            (when (and visit buffer-file-name)
              (setq buffer-file-name (concat "/:" buffer-file-name))))))