From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: daimrod@omecha.info (=?UTF-8?Q?Gr=C3=A9goire?= Jadi) Newsgroups: gmane.emacs.bugs Subject: bug#23994: [PATCH] Fix cl-defmethod indent with qualifier (Bug##23994) (Was: 25.1.50; cl-defmethod with qualifier indented incorrectly) Date: Tue, 25 Jul 2017 10:00:37 +0200 Message-ID: <87inihndy2.fsf@omecha.info> References: <87vb06j3qg.fsf@ericabrahamsen.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1500995302 20289 195.159.176.226 (25 Jul 2017 15:08:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 25 Jul 2017 15:08:22 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (berkeley-unix) To: 23994@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jul 25 17:08:17 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da1RV-0004tC-La for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jul 2017 17:08:13 +0200 Original-Received: from localhost ([::1]:33102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da1Rb-00072R-6y for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jul 2017 11:08:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da1RO-000707-SK for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 11:08:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1da1RK-0005PA-3z for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 11:08:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1da1RJ-0005P6-VR for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 11:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1da1RJ-0006xd-Mp for bug-gnu-emacs@gnu.org; Tue, 25 Jul 2017 11:08:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87vb06j3qg.fsf@ericabrahamsen.net> Resent-From: daimrod@omecha.info (=?UTF-8?Q?Gr=C3=A9goire?= Jadi) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 25 Jul 2017 15:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23994 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23994-submit@debbugs.gnu.org id=B23994.150099526926732 (code B ref 23994); Tue, 25 Jul 2017 15:08:01 +0000 Original-Received: (at 23994) by debbugs.gnu.org; 25 Jul 2017 15:07:49 +0000 Original-Received: from localhost ([127.0.0.1]:56056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da1R6-0006x5-Pi for submit@debbugs.gnu.org; Tue, 25 Jul 2017 11:07:49 -0400 Original-Received: from a.omecha.info ([89.234.176.136]:37218 helo=omecha.info) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZulo-0001qj-A7 for 23994@debbugs.gnu.org; Tue, 25 Jul 2017 04:00:44 -0400 Original-Received: from puffy.omecha.info (unknown [192.168.99.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by omecha.info (Postfix) with ESMTPSA id 2A46A1F8 for <23994@debbugs.gnu.org>; Tue, 25 Jul 2017 10:00:38 +0200 (CEST) X-Mailman-Approved-At: Tue, 25 Jul 2017 11:07:47 -0400 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:134976 Archived-At: --=-=-= Content-Type: text/plain Hello, I've been bitten by this bug as well on 25.2.1. I've attached a patch to fix it. Best, PS: I've FSF copyright assignment number #793656 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-cl-defmethod-indent-with-qualifier.patch >From 7aed0320d9471138c9ad6652c37fe05c563f9af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Jadi?= Date: Tue, 25 Jul 2017 09:46:32 +0200 Subject: [PATCH] Fix cl-defmethod indent with qualifier (Bug##23994) lisp/emacs-lisp/cl-generic.el(cl-defmethod): Indent `cl-defmethod' like a def construct. --- lisp/emacs-lisp/cl-generic.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 6a4ee47ac2..1d29082c62 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -409,7 +409,7 @@ cl-defmethod \(and can be extended) by the various methods of `cl-generic-generalizers'. \(fn NAME [QUALIFIER] ARGS &rest [DOCSTRING] BODY)" - (declare (doc-string 3) (indent 2) + (declare (doc-string 3) (indent defun) (debug (&define ; this means we are defining something [&or name ("setf" name :name setf)] -- 2.13.3 --=-=-=--