diff options
| author | Kaushal Modi | 2016-07-22 14:48:12 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2016-07-22 14:48:12 -0400 |
| commit | 03f32876210f3dd68c71baa210e523c3b7581758 (patch) | |
| tree | 169c239b48f79f3fcb502606afbe304a6777fc6d | |
| parent | d0e1774a5850b924915bde5abefe791ce18d84a2 (diff) | |
| download | emacs-03f32876210f3dd68c71baa210e523c3b7581758.tar.gz emacs-03f32876210f3dd68c71baa210e523c3b7581758.zip | |
Avoid repeated warnings while restoring desktop
* lisp/desktop.el (desktop-restore-file-buffer): Do not print warnings
when files are being opened during desktop restore.
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 1f460b7a3ed..df4ff551c2d 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -1402,7 +1402,7 @@ after that many seconds of idle time." | |||
| 1402 | (or coding-system-for-read | 1402 | (or coding-system-for-read |
| 1403 | (cdr (assq 'buffer-file-coding-system | 1403 | (cdr (assq 'buffer-file-coding-system |
| 1404 | desktop-buffer-locals)))) | 1404 | desktop-buffer-locals)))) |
| 1405 | (buf (find-file-noselect buffer-filename))) | 1405 | (buf (find-file-noselect buffer-filename :nowarn))) |
| 1406 | (condition-case nil | 1406 | (condition-case nil |
| 1407 | (switch-to-buffer buf) | 1407 | (switch-to-buffer buf) |
| 1408 | (error (pop-to-buffer buf))) | 1408 | (error (pop-to-buffer buf))) |