2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e214ec1d66..428ea4fffde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (out-of-memory-warning-percentage): Turn it off by default.
+
 2014-08-11  Sam Steingold  <sds@gnu.org>
 
         * textmodes/sgml-mode.el (sgml-validate-command): Set depending on
diff --git a/lisp/files.el b/lisp/files.el
index a9a279b2fa4..edbf647530c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1786,12 +1786,13 @@ When nil, never request confirmation."
   :version "22.1"
   :type '(choice integer (const :tag "Never request confirmation" nil)))
 
-(defcustom out-of-memory-warning-percentage 50
+(defcustom out-of-memory-warning-percentage nil
   "Warn if file size exceeds this percentage of available free memory.
-When nil, never issue warning."
+When nil, never issue warning.  Beware: This probably doesn't do what you
+think it does, because \"free\" is pretty hard to define in practice."
   :group 'files
   :group 'find-file
-  :version "24.4"
+  :version "24.5"
   :type '(choice integer (const :tag "Never issue warning" nil)))
 
 (defun abort-if-file-too-large (size op-type filename)