diff options
| author | Richard M. Stallman | 1997-12-21 02:34:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-12-21 02:34:59 +0000 |
| commit | 7b3d6b9c1adc074232beb0994b7d790bcfdec920 (patch) | |
| tree | e55eb51135c4573f505bfc62c04f717ea8200651 | |
| parent | 6b0f9bdfddf6ba954b2357fadcd00b9daaadd965 (diff) | |
| download | emacs-7b3d6b9c1adc074232beb0994b7d790bcfdec920.tar.gz emacs-7b3d6b9c1adc074232beb0994b7d790bcfdec920.zip | |
(find-file-noselect): Fix previous change.
| -rw-r--r-- | lisp/files.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el index 41f3c2d237e..4d977185d26 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -914,7 +914,8 @@ Optional second arg RAWFILE non-nil means the file is read literally." | |||
| 914 | (condition-case () | 914 | (condition-case () |
| 915 | (insert-file-contents-literally filename t) | 915 | (insert-file-contents-literally filename t) |
| 916 | (file-error | 916 | (file-error |
| 917 | (when (not (file-readable-p filename)) | 917 | (when (and (file-exists-p filename) |
| 918 | (not (file-readable-p filename))) | ||
| 918 | (kill-buffer buf) | 919 | (kill-buffer buf) |
| 919 | (signal 'file-error (list "File is not readable" | 920 | (signal 'file-error (list "File is not readable" |
| 920 | filename))) | 921 | filename))) |
| @@ -923,7 +924,8 @@ Optional second arg RAWFILE non-nil means the file is read literally." | |||
| 923 | (condition-case () | 924 | (condition-case () |
| 924 | (insert-file-contents filename t) | 925 | (insert-file-contents filename t) |
| 925 | (file-error | 926 | (file-error |
| 926 | (when (not (file-readable-p filename)) | 927 | (when (and (file-exists-p filename) |
| 928 | (not (file-readable-p filename))) | ||
| 927 | (kill-buffer buf) | 929 | (kill-buffer buf) |
| 928 | (signal 'file-error (list "File is not readable" | 930 | (signal 'file-error (list "File is not readable" |
| 929 | filename))) | 931 | filename))) |