diff options
| author | Kenichi Handa | 2010-08-06 12:54:13 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-08-06 12:54:13 +0900 |
| commit | faa28da9b740a4b5f297fc215d79a66d71bf6f78 (patch) | |
| tree | 6d7cdbf92c424aeff5ffa9444b7baf75a90ab2be /lisp/eshell | |
| parent | 6b4d96c2f04e5a08c4f9fff144743ff16c151dae (diff) | |
| parent | 9ebc731b45fea0b4d7d547cb37ca2675d5940106 (diff) | |
| download | emacs-faa28da9b740a4b5f297fc215d79a66d71bf6f78.tar.gz emacs-faa28da9b740a4b5f297fc215d79a66d71bf6f78.zip | |
merge trunk
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-io.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 1bcfe2b46e7..3aa785c7c1b 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el | |||
| @@ -343,8 +343,9 @@ it defaults to `insert'." | |||
| 343 | (let* ((exists (get-file-buffer target)) | 343 | (let* ((exists (get-file-buffer target)) |
| 344 | (buf (find-file-noselect target t))) | 344 | (buf (find-file-noselect target t))) |
| 345 | (with-current-buffer buf | 345 | (with-current-buffer buf |
| 346 | (if buffer-read-only | 346 | (if buffer-file-read-only |
| 347 | (error "Cannot write to read-only file `%s'" target)) | 347 | (error "Cannot write to read-only file `%s'" target)) |
| 348 | (setq buffer-read-only nil) | ||
| 348 | (set (make-local-variable 'eshell-output-file-buffer) | 349 | (set (make-local-variable 'eshell-output-file-buffer) |
| 349 | (if (eq exists buf) 0 t)) | 350 | (if (eq exists buf) 0 t)) |
| 350 | (cond ((eq mode 'overwrite) | 351 | (cond ((eq mode 'overwrite) |