Merge from emacs-24; up to 117687

[gnu-emacs] / lisp / files.el

diff --git a/lisp/files.el b/lisp/files.el
index be1b6c29d10133e84d4ab859d6bb34a5caac255f..c9d1d2da3b8db6661a7f2344598a19b87156ab64 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6670,7 +6670,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))))))