bug#23994: 25.1.50; cl-defmethod with qualifier indented incorrectly

bug#23994: 25.1.50; cl-defmethod with qualifier indented incorrectly

[Eric Abrahamsen]

cl-defmethod forms with a qualifier are indented incorrectly, ie:

(cl-defmethod base ((str string))
  "This one's okay"
  (message str))

(cl-defmethod base :extra "ext" ((str string))
	      "This one isn't"
	      (message "extra method")
	      (cl-call-next-method))

The incorrect indentation happens both for "single tag" qualifiers (ie
:before), and the tag-plus-string :extra qualifier.

bug#23994: [PATCH] Fix cl-defmethod indent with qualifier (Bug##23994) (Was: 25.1.50; cl-defmethod with qualifier indented incorrectly)

[Grégoire Jadi]

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-cl-defmethod-indent-with-qualifier.patch --]
[-- Type: text/x-patch, Size: 1006 bytes --]

From 7aed0320d9471138c9ad6652c37fe05c563f9af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Jadi?= <gjadi@omecha.info>
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

bug#23994: [PATCH] Fix cl-defmethod indent with qualifier (Bug##23994)

[Grégoire Jadi]

I forgot to mention that #23994 is a duplicate of #26067.

bug#23994: [PATCH] Fix cl-defmethod indent with qualifier (Bug##23994) (Was: 25.1.50; cl-defmethod with qualifier indented incorrectly)

[Dmitry Gutov]

Version: 26.1

On 7/25/17 11:00 AM, Grégoire Jadi wrote:

> I've been bitten by this bug as well on 25.2.1.
> I've attached a patch to fix it.

Pushed, thanks!