From db2d837603788e1c871b3bd3dfb04a9798bf72e5 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 9 Jun 2010 10:03:33 +0000
Subject: [PATCH] - Use display-formatted file name when asking about removing
 an emergency file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34631 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Buffer.cpp | 2 +-
 status.16x     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 4043d88ecc..792c262378 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2766,7 +2766,7 @@ bool Buffer::readFileHelper(FileName const & s)
 			else
 				str = _("Document was NOT successfully recovered.");
 			str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
-						from_utf8(e.absFilename()));
+						makeDisplayPath(e.absFilename()));
 
 			if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
 					_("&Remove"), _("&Keep it"))) {
diff --git a/status.16x b/status.16x
index eb7d345f1d..c2cc213113 100644
--- a/status.16x
+++ b/status.16x
@@ -129,6 +129,8 @@ What's new
 - Use right fonts for rendering the \underbar and \ensuremath macros in
   math when they are nested in certain environments (bug 6729 and 6745).
 
+- Use display-formatted file name when asking about removing an emergency
+  file.
 
 * DOCUMENTATION AND LOCALIZATION