* bug#19449: 25.0.50; `auto-revert-tail-mode' tries to revert remote files even if `auto-revert-remote-files' is nil
@ 2014-12-26 20:24 Filipp Gunbin
2014-12-28 12:34 ` Michael Albinus
0 siblings, 1 reply; 4+ messages in thread
From: Filipp Gunbin @ 2014-12-26 20:24 UTC (permalink / raw)
To: 19449
Below is the suggested patch.
Analysis:
When the `auto-revert-tail-mode' is called it temporarily enables
auto-revert-mode:
(or auto-revert-mode
(let ((auto-revert-tail-mode t))
(auto-revert-mode 1)))
`auto-revert-mode' then calls `auto-revert-buffers' which in turn calls
`auto-revert-handler' (fixed by the patch).
Then, this code yielded t:
+ (and (or auto-revert-mode
+ global-auto-revert-non-file-buffers)
which resulted as `revert' set to t.
In the end, `(auto-revert-tail-handler size)' was evaluted with nil
size.
This produces error:
Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p nil)
auto-revert-tail-handler(nil)
Fix:
In `revert' value calculation, `or' is changed to `if'. The "then"
clause applies to file-visiting buffers, this is where the result of
`file-remote-p' is analyzed. The "else" clause case applies to non-file
buffers.
Ok to apply?
Filipp
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f1074e2..514dc2b 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -589,8 +589,8 @@ This is an internal function used by Auto-Revert Mode."
;; the values.
(remote-file-name-inhibit-cache t)
(revert
- (or (and buffer-file-name
- (or auto-revert-remote-files
+ (if buffer-file-name
+ (and (or auto-revert-remote-files
(not (file-remote-p buffer-file-name)))
(or (not auto-revert-use-notify)
auto-revert-notify-modified-p)
@@ -603,11 +603,11 @@ This is an internal function used by Auto-Revert Mode."
(funcall (or buffer-stale-function
#'buffer-stale--default-function)
t)))
- (and (or auto-revert-mode
- global-auto-revert-non-file-buffers)
- (funcall (or buffer-stale-function
- #'buffer-stale--default-function)
- t))))
+ (and (or auto-revert-mode
+ global-auto-revert-non-file-buffers)
+ (funcall (or buffer-stale-function
+ #'buffer-stale--default-function)
+ t))))
eob eoblist)
(setq auto-revert-notify-modified-p nil)
(when revert
^ permalink raw reply related [flat|nested] 4+ messages in thread* bug#19449: 25.0.50; `auto-revert-tail-mode' tries to revert remote files even if `auto-revert-remote-files' is nil
2014-12-26 20:24 bug#19449: 25.0.50; `auto-revert-tail-mode' tries to revert remote files even if `auto-revert-remote-files' is nil Filipp Gunbin
@ 2014-12-28 12:34 ` Michael Albinus
2014-12-29 15:36 ` Filipp Gunbin
0 siblings, 1 reply; 4+ messages in thread
From: Michael Albinus @ 2014-12-28 12:34 UTC (permalink / raw)
To: Filipp Gunbin; +Cc: 19449
Filipp Gunbin <fgunbin@fastmail.fm> writes:
> Fix:
>
> In `revert' value calculation, `or' is changed to `if'. The "then"
> clause applies to file-visiting buffers, this is where the result of
> `file-remote-p' is analyzed. The "else" clause case applies to non-file
> buffers.
>
> Ok to apply?
Looks good to me. Please apply, preferred to the emacs-24 branch.
> Filipp
Best regards, Michael.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#19449: 25.0.50; `auto-revert-tail-mode' tries to revert remote files even if `auto-revert-remote-files' is nil
2014-12-28 12:34 ` Michael Albinus
@ 2014-12-29 15:36 ` Filipp Gunbin
2014-12-29 15:58 ` Michael Albinus
0 siblings, 1 reply; 4+ messages in thread
From: Filipp Gunbin @ 2014-12-29 15:36 UTC (permalink / raw)
To: Michael Albinus; +Cc: 19449-done
On 28/12/2014 13:34 +0100, Michael Albinus wrote:
> Filipp Gunbin <fgunbin@fastmail.fm> writes:
>
>> Fix:
>>
>> In `revert' value calculation, `or' is changed to `if'. The "then"
>> clause applies to file-visiting buffers, this is where the result of
>> `file-remote-p' is analyzed. The "else" clause case applies to non-file
>> buffers.
>>
>> Ok to apply?
>
> Looks good to me. Please apply, preferred to the emacs-24 branch.
Applied to emacs-24, thanks.
Sorry for excessive duplication in the commit message.
Filipp
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-29 15:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-26 20:24 bug#19449: 25.0.50; `auto-revert-tail-mode' tries to revert remote files even if `auto-revert-remote-files' is nil Filipp Gunbin
2014-12-28 12:34 ` Michael Albinus
2014-12-29 15:36 ` Filipp Gunbin
2014-12-29 15:58 ` Michael Albinus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).