summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2014-07-10 17:00:45 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2014-07-10 17:00:45 +0400
commit53dc1728079a2462d5e6ca2e187c2a6a61961e10 (patch)
tree83b859bac0e236438ce60ad0fd4d2ddc807db46c /lisp
parent9242810cd3bb14056dde937fc9ad39fc49261dfd (diff)
downloademacs-53dc1728079a2462d5e6ca2e187c2a6a61961e10.tar.gz
* files.el (warn-maybe-out-of-memory): Fix last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/files.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 63bdf636b63..1d3ffe81b99 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1798,19 +1798,19 @@ OP-TYPE specifies the file operation being performed (for message to user)."
(defun warn-maybe-out-of-memory (size)
"Warn if an attempt to open file of SIZE bytes may run out of memory."
- (let ((meminfo (memory-info)))
- (when (consp meminfo)
- (let ((total-free-memory (+ (nth 1 meminfo) (nth 3 meminfo))))
- (when (and (not (zerop size))
- (> (/ size 1024) total-free-memory))
- (warn
- "You are trying to open file which size (%s)
+ (when (and (numberp size) (not (zerop size)))
+ (let ((meminfo (memory-info)))
+ (when (consp meminfo)
+ (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)."
- (file-size-human-readable size)
- (file-size-human-readable
- (* (float total-free-memory) 1024))))))))
+ (file-size-human-readable size)
+ (file-size-human-readable
+ (* (float total-free-memory) 1024)))))))))
(defun find-file-noselect (filename &optional nowarn rawfile wildcards)
"Read file FILENAME into a buffer and return the buffer.