diff options
| author | Eli Zaretskii | 2014-07-10 21:19:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-07-10 21:19:37 +0300 |
| commit | 64c333303ce41c4d014d676ff4cbeeb887506c9e (patch) | |
| tree | 47e90e470c530101ba90b90f28117ec23f12fb96 | |
| parent | 53dc1728079a2462d5e6ca2e187c2a6a61961e10 (diff) | |
| download | emacs-64c333303ce41c4d014d676ff4cbeeb887506c9e.tar.gz emacs-64c333303ce41c4d014d676ff4cbeeb887506c9e.zip | |
lisp/files.el (warn-maybe-out-of-memory): Fix the wording of the warning.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ffb1eee945e..4e19be4d3ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * files.el (warn-maybe-out-of-memory): Fix the wording of the | ||
| 4 | warning. | ||
| 5 | |||
| 1 | 2014-07-10 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2014-07-10 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * files.el (warn-maybe-out-of-memory): New function. | 8 | * files.el (warn-maybe-out-of-memory): New function. |
diff --git a/lisp/files.el b/lisp/files.el index 1d3ffe81b99..258a37616c1 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -1804,10 +1804,10 @@ OP-TYPE specifies the file operation being performed (for message to user)." | |||
| 1804 | (let ((total-free-memory (+ (nth 1 meminfo) (nth 3 meminfo)))) | 1804 | (let ((total-free-memory (+ (nth 1 meminfo) (nth 3 meminfo)))) |
| 1805 | (when (> (/ size 1024) total-free-memory) | 1805 | (when (> (/ size 1024) total-free-memory) |
| 1806 | (warn | 1806 | (warn |
| 1807 | "You are trying to open file which size (%s) | 1807 | "You are trying to open a file whose size (%s) |
| 1808 | exceeds an amount of available free memory (%s). If that | 1808 | exceeds the amount of currently available free memory (%s). |
| 1809 | fails, try to open it with `find-file-literally' (but note | 1809 | If that fails, try to open it with `find-file-literally' |
| 1810 | that some characters may be displayed incorrectly)." | 1810 | \(but note that some characters might be displayed incorrectly)." |
| 1811 | (file-size-human-readable size) | 1811 | (file-size-human-readable size) |
| 1812 | (file-size-human-readable | 1812 | (file-size-human-readable |
| 1813 | (* (float total-free-memory) 1024))))))))) | 1813 | (* (float total-free-memory) 1024))))))))) |