Wrong indentation of defun with indent-region

Wrong indentation of defun with indent-region

[Peter Vasil]

Hello,

Since commit 6fa9cc0593150a318f0e08e69ec10672d548a7c1 indent-region
doesn't indent correctly a defun when docstring is more than one line.

Reproduction:

(defun test ()
  "Test.
Two lines docstring."
  (message "Test"))

With cursor somewhere in the function and after M-x mark-defun RET and
M-x indent-region RET is this the result:


(defun test-func ()
  "Test func.
Two lines docstring."
       (message "Test"))

However if the docstring is only one line the indentation stays correct.

Regards,
Peter Vasil

Re: Wrong indentation of defun with indent-region

[Peter Vasil]

On 04/30/2017 06:31 PM, Peter Vasil wrote:
> Hello,
> 
> Since commit 6fa9cc0593150a318f0e08e69ec10672d548a7c1 indent-region
> doesn't indent correctly a defun when docstring is more than one line.
> 
> Reproduction:
> 
> (defun test ()
>   "Test.
> Two lines docstring."
>   (message "Test"))
> 
> With cursor somewhere in the function and after M-x mark-defun RET and
> M-x indent-region RET is this the result:
> 
> 
> (defun test-func ()
>   "Test func.
> Two lines docstring."
>        (message "Test"))
> 
> However if the docstring is only one line the indentation stays correct.
> 
> Regards,
> Peter Vasil
> 
> 
> 

I wrote this small ert test which fails:

diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el
b/test/lisp/emacs-lisp/lisp-mode-tests.el
index 27f0bb5..4856318 100644
--- a/test/lisp/emacs-lisp/lisp-mode-tests.el
+++ b/test/lisp/emacs-lisp/lisp-mode-tests.el
@@ -97,5 +97,19 @@
       (indent-sexp)
       (should (equal (buffer-string) correct)))))

+(ert-deftest indent-region ()
+  (with-temp-buffer
+    (emacs-lisp-mode)
+    (insert "
+(defun test ()
+  \"Test func.
+Two lines docstring.\"
+  (message \"Test\"))")
+    (let ((correct (buffer-string)))
+      (search-backward "message")
+      (mark-defun)
+      (indent-region (region-beginning) (region-end))
+      (should (equal (buffer-string) correct)))))
+
 (provide 'lisp-mode-tests)


Result:

Selector: t
Passed:  0
Failed:  1 (1 unexpected)
Skipped: 0
Total:   1/1

Started at:   2017-04-30 18:49:36+0200
Finished.
Finished at:  2017-04-30 18:49:36+0200

F

F indent-region
    (ert-test-failed
     ((should
       (equal
	(buffer-string)
	correct))
      :form
      (equal "
(defun test ()
  \"Test func.
Two lines docstring.\"
       (message \"Test\"))" "
(defun test ()
  \"Test func.
Two lines docstring.\"
  (message \"Test\"))")
      :value nil :explanation
      (arrays-of-different-length 76 71 "
(defun test ()
  \"Test func.
Two lines docstring.\"
       (message \"Test\"))" "
(defun test ()
  \"Test func.
Two lines docstring.\"
  (message \"Test\"))" first-mismatch-at 54)))

Re: Wrong indentation of defun with indent-region

[Noam Postavsky]

On Sun, Apr 30, 2017 at 12:31 PM, Peter Vasil
<mailing_lists@petervasil.net> wrote:
>
> Since commit 6fa9cc0593150a318f0e08e69ec10672d548a7c1 indent-region
> doesn't indent correctly a defun when docstring is more than one line.

Please try out the patch at
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26619#40

Re: Wrong indentation of defun with indent-region

[Peter Vasil]

Ok thanks! I should have looked more thoroughly if there is already a
bug report.

I tried the patch and its seems to fix the issue.

Peter

On 04/30/2017 07:58 PM, Noam Postavsky wrote:
> On Sun, Apr 30, 2017 at 12:31 PM, Peter Vasil
> <mailing_lists@petervasil.net> wrote:
>>
>> Since commit 6fa9cc0593150a318f0e08e69ec10672d548a7c1 indent-region
>> doesn't indent correctly a defun when docstring is more than one line.
> 
> Please try out the patch at
> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26619#40
> 
>