diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2007-03-19 18:29:56 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2007-03-19 18:29:56 +0000 |
| commit | c412f81ab8f00b9941844c24a56033a173c65db5 (patch) | |
| tree | 4e9adb7b26c327ee3b9dda9099018e3831df8752 /lisp | |
| parent | 39a8d88a7f9d5f08cd7c17d5101748337cd72abd (diff) | |
| download | emacs-c412f81ab8f00b9941844c24a56033a173c65db5.tar.gz | |
Revert 2006-12-08 change by Kevin Rodgers due to lack of legal papers.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/files.el | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b119505d032..b36dc58b38c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2471,12 +2471,6 @@ * comint.el (comint-insert-input): Delete obsolete comment. -2006-12-08 Kevin Rodgers <ihs_4664@yahoo.com> - - * files.el (insert-file-1): Compare file size to - large-file-warning-threshold and request confirmation when - warranted. - 2006-12-08 Stefan Monnier <monnier@iro.umontreal.ca> * net/browse-url.el (browse-url): Set DISPLAY to the one of the diff --git a/lisp/files.el b/lisp/files.el index cfbbff029b6..50180dc6ebf 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1700,16 +1700,6 @@ This function ensures that none of these modifications will take place." (if (file-directory-p filename) (signal 'file-error (list "Opening input file" "file is a directory" filename))) - ;; Check whether the file is uncommonly large (see find-file-noselect): - (let (size) - (when (and large-file-warning-threshold - (setq size (nth 7 (file-attributes filename))) - (> size large-file-warning-threshold) - (not (y-or-n-p - (format "File %s is large (%dMB), really insert? " - (file-name-nondirectory filename) - (/ size 1048576))))) - (error "Aborted"))) (let* ((buffer (find-buffer-visiting (abbreviate-file-name (file-truename filename)) #'buffer-modified-p)) (tem (funcall insert-func filename))) |