* src/alloc.c (Fmemory_info) [HAVE_LINUX_SYSINFO]: Return nil if

sysinfo failed.  Adjust docstring.
* doc/lispref/internals.texi (Garbage Collection): Mention memory-info.
* lisp/files.el (out-of-memory-warning-percentage): New defcustom.
(warn-maybe-out-of-memory): Use it.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e469880a4ce..52ba04d2f5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (Fmemory_info) [HAVE_LINUX_SYSINFO]: Return nil if
+        sysinfo failed.  Adjust docstring.
+
 2014-07-11  Eli Zaretskii  <eliz@gnu.org>
 
         Implement memory-info for MS-DOS.
diff --git a/src/alloc.c b/src/alloc.c
index 77be94d73d1..a8ad44491fa 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6875,8 +6875,9 @@ gc_sweep (void)
 
 DEFUN ("memory-info", Fmemory_info, Smemory_info, 0, 0, 0,
        doc: /* Return a list of (TOTAL-RAM FREE-RAM TOTAL-SWAP FREE-SWAP).
-All values are in Kbytes.  If there is no swap space, last two
-values are zero.  If the system is not supported, return nil.  */)
+All values are in Kbytes.  If there is no swap space,
+last two values are zero.  If the system is not supported
+or memory information can't be obtained, return nil.  */)
   (void)
 {
 #if defined HAVE_LINUX_SYSINFO
@@ -6884,7 +6885,7 @@ values are zero.  If the system is not supported, return nil.  */)
   uintmax_t units;
 
   if (sysinfo (&si))
-    emacs_abort ();
+    return Qnil;
 #ifdef LINUX_SYSINFO_UNIT
   units = si.mem_unit;
 #else