From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 18 Apr 2016 08:11:44 +0000 (+0200)
Subject: Fix Bug#23276
X-Git-Tag: emacs-25.0.93~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a0cbe5;p=emacs.git

Fix Bug#23276

* lisp/autorevert.el (auto-revert-handler): Ignore errors
coming from `revert-buffer'.  (Bug#23276)
---

diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index b7f1f3691f0..b8693dfb210 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -684,7 +684,10 @@ This is an internal function used by Auto-Revert Mode."
         ;; not to forget that.  This gives undesirable results when
         ;; the file's mode changes, but that is less common.
         (let ((buffer-read-only buffer-read-only))
-          (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes)))
+          ;; Bug#23276: When the file has been deleted, keep the
+          ;; buffer unchanged.
+          (ignore-errors
+            (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes))))
       (when buffer-file-name
         (when eob (goto-char (point-max)))
         (dolist (window eoblist)