[Emacs-diffs] emacs-24 r117679: * files.el (file-name-non-special): Wrap the call of

[Michael Albinus]

------------------------------------------------------------
revno: 117679
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18891
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-11-07 15:42:51 +0100
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-07 04:16:26 +0000
+++ b/lisp/ChangeLog    2014-11-07 14:42:51 +0000
@@ -1,3 +1,9 @@
+2014-11-07  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * epg.el (epg--list-keys-1): Ignore fields after the 15th field

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-08-11 00:38:19 +0000
+++ b/lisp/files.el     2014-11-07 14:42:51 +0000
@@ -6664,7 +6664,7 @@
       (`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))))))