Mercurial > emacs
changeset 103993:4ea8e9dfba54
(abort-if-file-too-large): Explicitly pass `filename' as an argument.
(find-file-noselect, insert-file-1): Update for above change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 21 Jul 2009 04:37:53 +0000 |
| parents | 712b0413cdc1 |
| children | bc30507da7f8 |
| files | lisp/files.el |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Mon Jul 20 19:04:15 2009 +0000 +++ b/lisp/files.el Tue Jul 21 04:37:53 2009 +0000 @@ -1659,7 +1659,7 @@ :version "22.1" :type '(choice integer (const :tag "Never request confirmation" nil))) -(defun abort-if-file-too-large (size op-type) +(defun abort-if-file-too-large (size op-type filename) "If file SIZE larger than `large-file-warning-threshold', allow user to abort. OP-TYPE specifies the file operation being performed (for message to user)." (when (and large-file-warning-threshold size @@ -1722,7 +1722,7 @@ (setq buf other)))) ;; Check to see if the file looks uncommonly large. (when (not (or buf nowarn)) - (abort-if-file-too-large (nth 7 attributes) "open")) + (abort-if-file-too-large (nth 7 attributes) "open" filename)) (if buf ;; We are using an existing buffer. (let (nonexistent) @@ -1943,7 +1943,7 @@ (signal 'file-error (list "Opening input file" "file is a directory" filename))) ;; Check whether the file is uncommonly large - (abort-if-file-too-large (nth 7 (file-attributes filename)) "insert") + (abort-if-file-too-large (nth 7 (file-attributes filename)) "insert" filename) (let* ((buffer (find-buffer-visiting (abbreviate-file-name (file-truename filename)) #'buffer-modified-p)) (tem (funcall insert-func filename)))