From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.bugs Subject: bug#23625: viper-tests.el fails in master Date: Thu, 26 May 2016 22:38:23 +0100 Message-ID: <871t4oijow.fsf@russet.org.uk> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1464298771 30888 80.91.229.3 (26 May 2016 21:39:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 May 2016 21:39:31 +0000 (UTC) Cc: 23625@debbugs.gnu.org, monnier@iro.umontreal.ca To: Paul Eggert Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 26 23:39:16 2016 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 1b62zs-0000uq-2a for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 May 2016 23:39:16 +0200 Original-Received: from localhost ([::1]:40702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62zq-0007Y5-Uk for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 May 2016 17:39:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62zi-0007Wp-7Z for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:39:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b62zd-0003St-QT for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:39:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62zd-0003Sj-N8 for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:39:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1b62zd-0004AC-I5 for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:39:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: phillip.lord@russet.org.uk (Phillip Lord) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 May 2016 21:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23625 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-Cc: 23625@debbugs.gnu.org, Emacs bug reports , Stefan Monnier Original-Received: via spool by submit@debbugs.gnu.org id=B.146429872115981 (code B ref -1); Thu, 26 May 2016 21:39:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 26 May 2016 21:38:41 +0000 Original-Received: from localhost ([127.0.0.1]:40988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b62zJ-00049h-7z for submit@debbugs.gnu.org; Thu, 26 May 2016 17:38:41 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b62zH-00049U-86 for submit@debbugs.gnu.org; Thu, 26 May 2016 17:38:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b62zA-0003Ky-VZ for submit@debbugs.gnu.org; Thu, 26 May 2016 17:38:33 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62zA-0003Kl-S2 for submit@debbugs.gnu.org; Thu, 26 May 2016 17:38:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62z8-0007T8-Hu for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:38:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b62z4-0003Jp-C1 for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:38:29 -0400 Original-Received: from cloud103.planethippo.com ([31.216.48.48]:50386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b62z4-0003Jk-1L for bug-gnu-emacs@gnu.org; Thu, 26 May 2016 17:38:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=PYnGOtx5/IOYAhGys4nw38gJa844g5hdOUqVKltzC6I=; b=XEGEk8yNC8dnEm0gU8k4I/iwbi a9O9wVPQJL0ji3dJrV2lVeUmTkN8KsSZhHhAvPuH8V+XW4dovkkcPLzZelMNc7T0BNDjlABCAz9la IPL8CACBW4PX0vjtaA3MwQW3mN3nF5P869wnEP2PC4kLOTKx8gVsjv3EMyhTEgUZGfzDCm+Z5L+cg vMYC+hLlA1mp2c1uiorEnzOnb5OzXMy8eemqf16g3s4RLDvwQc3v36REEnaLuUs75n3Ql9dmsWLtF D7hL2khSUC66haVU8Z8gPgSDaDogmqsdXNb7966vjqxAoxHQGQPadeiXxyxwQ3KNd//SAaFqBWPU1 PXcGfAgA==; Original-Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:43050 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1b62z2-003zCn-As; Thu, 26 May 2016 22:38:24 +0100 In-Reply-To: (Paul Eggert's message of "Thu, 26 May 2016 13:33:53 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.94 (gnu/linux) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:118727 Archived-At: --=-=-= Content-Type: text/plain Paul Eggert writes: > Phillip, I just now merged emacs-25 into master and fixed all the merge > conflicts that were easy, but one problem remains: viper-tests, which you > recently introduced to emacs-25, fails in the new master. Could you please > look into this? I don't offhand know what viper-tests is supposed to do and > don't know how to interpret the test failures. Thanks. They are "do this, do that" keyboard macros. Hard to explain what they do other than "this is how viper is supposed to behave". Anyway, I think that the tests are working -- that is, they are picking up a real bug, caused independently by 088acab3 which was from Stefan. I've attached a fix. Stefan, can you check I have this right? > (Is there any way to fix the test so that it outputs ordinary text when it > fails?) > #[nil "\301 \210\30!\207" [before-buffer toggle-viper-mode switch- You mean this bit? To be honest I am not sure where that bit of trace is coming from. Phil --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-broken-viper-deactivation.patch >From 76409ca9daf72b697db9c1983aa322a365bfc066 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Thu, 26 May 2016 22:18:32 +0100 Subject: [PATCH] Fix broken viper deactivation * lisp/emulation/viper.el (viper--deactivate-advice-list): Destructure args to advice-remove. (viper--advice-add): Use cons not list. Addresses bug#23625 --- lisp/emulation/viper.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index a0bba9a..1ee1464 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -647,10 +647,14 @@ viper--advice-list (defun viper--advice-add (function where advice) (advice-add function where advice) - (push (list function advice) viper--advice-list)) + (push (cons function advice) viper--advice-list)) (defun viper--deactivate-advice-list () - (mapc #'advice-remove viper--advice-list) + (mapc (lambda (n) + (advice-remove + (car n) + (cdr n))) + viper--advice-list) (setq viper--advice-list nil)) (defun viper-go-away () -- 2.8.3 --=-=-=--