* 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, 8 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 17af128ae49..5f7e00a4f10 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * internals.texi (Garbage Collection): Mention memory-info.
+
 2014-07-11  Michael Albinus  <michael.albinus@gmx.de>
 
         * minibuf.texi (Intro to Minibuffers, Reading a Password):
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 3a5bd4aea7e..626ecad7f42 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -513,6 +513,10 @@ created in this Emacs session.  Each of these counters increments for
 a certain kind of object.  See the documentation string for details.
 @end defun
 
+@defun memory-info
+This functions returns an amount of total system memory and how much
+of it is free.  On an unsupported system, the value may be @code{nil}.
+
 @defvar gcs-done
 This variable contains the total number of garbage collections
 done so far in this Emacs session.