From: Sam Steingold <sds@gnu.org>
Date: Thu, 14 Jun 2012 19:55:28 +0000 (-0400)
Subject: * lisp/files.el (abort-if-file-too-large): Use `file-size-human-readable'.
X-Git-Tag: emacs-24.2.90~1199^2~474^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54c5ba1a5f83296e02a108c259de6342361a5c7f;p=emacs.git

* lisp/files.el (abort-if-file-too-large): Use `file-size-human-readable'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdc04a789b5..cbf271fb924 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-14  Sam Steingold  <sds@gnu.org>
+
+	* files.el (abort-if-file-too-large): Use `file-size-human-readable'.
+
 2012-06-14  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* play/doctor.el (doctor-doc): Remove parameter and use
diff --git a/lisp/files.el b/lisp/files.el
index a934eca4527..b1f6fe6e4c6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1776,9 +1776,9 @@ When nil, never request confirmation."
 OP-TYPE specifies the file operation being performed (for message to user)."
   (when (and large-file-warning-threshold size
 	     (> size large-file-warning-threshold)
-	     (not (y-or-n-p (format "File %s is large (%dMB), really %s? "
+	     (not (y-or-n-p (format "File %s is large (%s), really %s? "
 				    (file-name-nondirectory filename)
-				    (/ size 1048576) op-type))))
+				    (file-size-human-readable size) op-type))))
     (error "Aborted")))
 
 (defun find-file-noselect (filename &optional nowarn rawfile wildcards)