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#23947: Regression in EIEIO Date: Mon, 11 Jul 2016 13:27:50 -0400 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1468258167 1694 80.91.229.3 (11 Jul 2016 17:29:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jul 2016 17:29:27 +0000 (UTC) To: 23947@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 11 19:29: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 1bMf19-0000YG-NK for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Jul 2016 19:29:15 +0200 Original-Received: from localhost ([::1]:34882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMf18-00046J-Tr for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Jul 2016 13:29:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMf12-00046D-ET for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:29:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMf0w-0000tk-EP for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:29:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMf0w-0000tg-Ac for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bMf0w-000808-7V for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:29: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 Jul 2016 17:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 23947 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.146825808630640 (code B ref -1); Mon, 11 Jul 2016 17:29:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Jul 2016 17:28:06 +0000 Original-Received: from localhost ([127.0.0.1]:47079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMf02-0007y8-4X for submit@debbugs.gnu.org; Mon, 11 Jul 2016 13:28:06 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMezz-0007xd-Uy for submit@debbugs.gnu.org; Mon, 11 Jul 2016 13:28:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMezt-0000ja-PV for submit@debbugs.gnu.org; Mon, 11 Jul 2016 13:27:58 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:42023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMezt-0000jQ-MV for submit@debbugs.gnu.org; Mon, 11 Jul 2016 13:27:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMezr-0003uI-CV for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:27:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMezo-0000j7-2I for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:27:55 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:48756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMezn-0000j0-Tx for bug-gnu-emacs@gnu.org; Mon, 11 Jul 2016 13:27:51 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CtQQA731xV/3mcpUVcgxABgTGCUK9PgwQBj0NJhgAEgUA8EQEBAQEBAQGBCkEFhDlfEyEBHA03iCybL7QgizqBPQGDZIQXBYtEjimZUoFFI2FmDESBfSIxgkcBAQE X-IPAS-Result: A0CtQQA731xV/3mcpUVcgxABgTGCUK9PgwQBj0NJhgAEgUA8EQEBAQEBAQGBCkEFhDlfEyEBHA03iCybL7QgizqBPQGDZIQXBYtEjimZUoFFI2FmDESBfSIxgkcBAQE X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="247501022" Original-Received: from 69-165-156-121.dsl.teksavvy.com (HELO pastel.home) ([69.165.156.121]) by ironport2-out.teksavvy.com with ESMTP; 11 Jul 2016 13:27:50 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 89792643C1; Mon, 11 Jul 2016 13:27:50 -0400 (EDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:120862 Archived-At: Package: Emacs Version: 25.0.95 I finally tracked down why GNU ELPA's "rudel" package wasn't working with Emacs-25, and it turns out to be a combination of two bugs in the new EIEIO code. Rudel seems to be the heaviest user of EIEIO so far (e.g. the only user of the :c3 method invocation order, since the eieio-core code had a plain bug which made it signal an error whenever that was used). The patch below lets Rudel setup a shared buffer, so at least the core functionality now works. To my eyes, this is a very safe patch which just fixes an incompatibility and an error I introduced in the new EIEIO code when moving to cl-generic, so I think it should go to emacs-25. Any objection? Stefan 2016-07-11 Stefan Monnier * lisp/emacs-lisp/eieio-compat.el (eieio--defmethod): Better obey EIEIO's `no-applicable-method' calling convention. * lisp/emacs-lisp/eieio-core.el (eieio--class-precedence-c3): `class' is not a symbol but a class object. diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el index 6d4798b..6aba8a3 100644 --- a/lisp/emacs-lisp/eieio-compat.el +++ b/lisp/emacs-lisp/eieio-compat.el @@ -188,7 +188,8 @@ eieio--defmethod (`no-applicable-method (setq method 'cl-no-applicable-method) (setq specializers `(generic ,@specializers)) - (lambda (generic arg &rest args) (apply code arg generic args))) + (lambda (generic arg &rest args) + (apply code arg (cl--generic-name generic) (cons arg args)))) (_ code)))) (cl-generic-define-method method (unless (memq kind '(nil :primary)) (list kind)) diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 631e4a4..223c2a6 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -976,7 +976,7 @@ eieio--class/struct-parents (defun eieio--class-precedence-c3 (class) "Return all parents of CLASS in c3 order." - (let ((parents (eieio--class-parents (cl--find-class class)))) + (let ((parents (eieio--class-parents class))) (eieio--c3-merge-lists (list class) (append @@ -1101,7 +1101,7 @@ eieio--generic-subclass-specializers (list eieio--generic-subclass-generalizer)) -;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "6aca3c1b5f751a01331761da45fc4f5c") +;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "dba4205b1a0d7133f1311d975b4d0ebe") ;;; Generated autoloads from eieio-compat.el (autoload 'eieio--defalias "eieio-compat" "\