summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorKaushal Modi <kaushal.modi@gmail.com>2016-07-22 14:48:12 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2016-07-22 14:48:12 -0400
commit03f32876210f3dd68c71baa210e523c3b7581758 (patch)
tree169c239b48f79f3fcb502606afbe304a6777fc6d /lisp/desktop.el
parentd0e1774a5850b924915bde5abefe791ce18d84a2 (diff)
downloademacs-03f32876210f3dd68c71baa210e523c3b7581758.tar.gz
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.
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el2
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."
(or coding-system-for-read
(cdr (assq 'buffer-file-coding-system
desktop-buffer-locals))))
- (buf (find-file-noselect buffer-filename)))
+ (buf (find-file-noselect buffer-filename :nowarn)))
(condition-case nil
(switch-to-buffer buf)
(error (pop-to-buffer buf)))