diff options
| author | Stefan Monnier | 2014-08-11 22:35:24 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-08-11 22:35:24 -0400 |
| commit | eb7b19f0134d298ee4e465e9e035bc9002fea06b (patch) | |
| tree | cd11ba7c4ca9dbc5b73f9dd6591ded7249a54f41 /lisp | |
| parent | 70276d32c755dc94328463e102e7b3cbf8fefd55 (diff) | |
| download | emacs-eb7b19f0134d298ee4e465e9e035bc9002fea06b.tar.gz emacs-eb7b19f0134d298ee4e465e9e035bc9002fea06b.zip | |
* lisp/files.el (out-of-memory-warning-percentage): Turn it off by default.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 7 |
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 @@ | |||
| 1 | 2014-08-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * files.el (out-of-memory-warning-percentage): Turn it off by default. | ||
| 4 | |||
| 1 | 2014-08-11 Sam Steingold <sds@gnu.org> | 5 | 2014-08-11 Sam Steingold <sds@gnu.org> |
| 2 | 6 | ||
| 3 | * textmodes/sgml-mode.el (sgml-validate-command): Set depending on | 7 | * 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." | |||
| 1786 | :version "22.1" | 1786 | :version "22.1" |
| 1787 | :type '(choice integer (const :tag "Never request confirmation" nil))) | 1787 | :type '(choice integer (const :tag "Never request confirmation" nil))) |
| 1788 | 1788 | ||
| 1789 | (defcustom out-of-memory-warning-percentage 50 | 1789 | (defcustom out-of-memory-warning-percentage nil |
| 1790 | "Warn if file size exceeds this percentage of available free memory. | 1790 | "Warn if file size exceeds this percentage of available free memory. |
| 1791 | When nil, never issue warning." | 1791 | When nil, never issue warning. Beware: This probably doesn't do what you |
| 1792 | think it does, because \"free\" is pretty hard to define in practice." | ||
| 1792 | :group 'files | 1793 | :group 'files |
| 1793 | :group 'find-file | 1794 | :group 'find-file |
| 1794 | :version "24.4" | 1795 | :version "24.5" |
| 1795 | :type '(choice integer (const :tag "Never issue warning" nil))) | 1796 | :type '(choice integer (const :tag "Never issue warning" nil))) |
| 1796 | 1797 | ||
| 1797 | (defun abort-if-file-too-large (size op-type filename) | 1798 | (defun abort-if-file-too-large (size op-type filename) |