From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20539: 24.5; magit-auto-revert-mode broken by 24.5 upgrade with change to behaviour of `let` Date: Sun, 10 May 2015 22:33:21 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1431311663 20218 80.91.229.3 (11 May 2015 02:34:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 May 2015 02:34:23 +0000 (UTC) Cc: 20539@debbugs.gnu.org To: "Greg A. Woods" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 11 04:34:12 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YrdXn-0006So-Gp for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 May 2015 04:34:11 +0200 Original-Received: from localhost ([::1]:35257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrdXm-0003Pv-OH for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 May 2015 22:34:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrdXj-0003Pp-69 for bug-gnu-emacs@gnu.org; Sun, 10 May 2015 22:34:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrdXe-0003QP-Vy for bug-gnu-emacs@gnu.org; Sun, 10 May 2015 22:34:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrdXe-0003QL-Sq for bug-gnu-emacs@gnu.org; Sun, 10 May 2015 22:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YrdXe-0002aj-Je for bug-gnu-emacs@gnu.org; Sun, 10 May 2015 22:34:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 May 2015 02:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20539 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20539-submit@debbugs.gnu.org id=B20539.14313116159925 (code B ref 20539); Mon, 11 May 2015 02:34:02 +0000 Original-Received: (at 20539) by debbugs.gnu.org; 11 May 2015 02:33:35 +0000 Original-Received: from localhost ([127.0.0.1]:40366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YrdXC-0002a0-79 for submit@debbugs.gnu.org; Sun, 10 May 2015 22:33:34 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:12515) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YrdXA-0002Zn-KZ for 20539@debbugs.gnu.org; Sun, 10 May 2015 22:33:33 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AnEFAGvvdVRFpYts/2dsb2JhbAA3gVOfQYIugQiBdgEFJy8jEAs0BwsUGA0kqiSMDGQDgz4DAxkBg1MEo2OEWA X-IPAS-Result: AnEFAGvvdVRFpYts/2dsb2JhbAA3gVOfQYIugQiBdgEFJy8jEAs0BwsUGA0kqiSMDGQDgz4DAxkBg1MEo2OEWA X-IronPort-AV: E=Sophos;i="5.11,557,1422939600"; d="scan'208";a="119104028" Original-Received: from 69-165-139-108.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([69.165.139.108]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 10 May 2015 22:33:27 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id CC59DAE36F; Sun, 10 May 2015 22:33:21 -0400 (EDT) In-Reply-To: (Greg A. Woods's message of "Sat, 09 May 2015 13:17:17 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:102649 Archived-At: > +++ /Users/gaw/.emacs.d/elpa/magit-1.4.1/magit.el 2015-05-09 13:04:57.000000000 -0700 > @@ -4065,7 +4065,8 @@ > (and file (string-prefix-p topdir file) > (not (string-prefix-p gitdir file)) > (member (file-relative-name file topdir) tracked) > - (let ((auto-revert-mode t)) > + (progn > + (auto-revert-mode t) > (auto-revert-handler) > (run-hooks 'magit-revert-buffer-hook)))))))))) I see you've figured that the above patch won't really do what you want, and that calling auto-revert-handler is a bad idea here. I think it should just check if the buffer is modified and if not call revert-buffer. The obvious other place where such a code can be found is in PCL-CVS where we did the exact same thing for the same reasons (before auto-revert-mode existed): (unless (or (null buffer) (memq (cvs-fileinfo->type fileinfo) '(MESSAGE UNKNOWN)) ;; FIXME: check whether revert is really needed. ;; `(verify-visited-file-modtime buffer)' doesn't cut it ;; because it only looks at the time stamp (it ignores ;; read-write changes) which is not changed by `commit'. (buffer-modified-p buffer)) (with-current-buffer buffer (ignore-errors (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) ;; `preserve-modes' avoids changing the (minor) modes. But we ;; do want to reset the mode for VC, so we do it explicitly. (vc-find-file-hook) (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) (smerge-start-session)))))))) -- Stefan