[Emacs-diffs] trunk r117509: lisp/files.el (warn-maybe-out-of-memory): Fix the wording of the warning.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117509
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2014-07-10 21:19:37 +0300
message:
  lisp/files.el (warn-maybe-out-of-memory): Fix the wording of the warning.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-10 12:33:35 +0000
+++ b/lisp/ChangeLog    2014-07-10 18:19:37 +0000
@@ -1,3 +1,8 @@
+2014-07-10  Eli Zaretskii  <address@hidden>
+
+       * files.el (warn-maybe-out-of-memory): Fix the wording of the
+       warning.
+
 2014-07-10  Dmitry Antipov  <address@hidden>
 
        * files.el (warn-maybe-out-of-memory): New function.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-07-10 13:00:45 +0000
+++ b/lisp/files.el     2014-07-10 18:19:37 +0000
@@ -1804,10 +1804,10 @@
        (let ((total-free-memory (+ (nth 1 meminfo) (nth 3 meminfo))))
          (when (> (/ size 1024) total-free-memory)
            (warn
-            "You are trying to open file which size (%s)
-exceeds an amount of available free memory (%s).  If that
-fails, try to open it with `find-file-literally' (but note
-that some characters may be displayed incorrectly)."
+            "You are trying to open a file whose size (%s)
+exceeds the amount of currently available free memory (%s).
+If that fails, try to open it with `find-file-literally'
+\(but note that some characters might be displayed incorrectly)."
             (file-size-human-readable size)
             (file-size-human-readable
              (* (float total-free-memory) 1024)))))))))