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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdc04a789b559fe1cd4f5bf94789b5b6790811f2..cbf271fb92400853d7b3d52689a8c9401e029648 100644 (file)
--- 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 a934eca452799e6867bb5901496ee013cc0ef5ff..b1f6fe6e4c680654f50605597bce94809aa55603 100644 (file)
--- 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)