* bug#31984: 26.1.50; IELM doesn't indent results printed with #
@ 2018-06-26 19:42 Gemini Lasswell
2018-06-28 2:01 ` Noam Postavsky
2018-07-26 11:49 ` Davor Rotim
0 siblings, 2 replies; 7+ messages in thread
From: Gemini Lasswell @ 2018-06-26 19:42 UTC (permalink / raw)
To: 31984
When the result of evaluation in IELM is something with a printed
representation beginning with #, such as a record or char-table,
it is pretty-printed without indentation.
To reproduce, M-x ielm RET and then evaluate this:
(require 'cl-lib)
(cl-defstruct (foo) a)
(make-foo :a (lambda (x) (- 1 x)))
Result:
#s(foo :a
(lambda
(x)
(- 1 x)))
If you do the same thing in Emacs 25, this is the result:
[cl-struct-foo
(lambda
(x)
(- 1 x))]
Here are two other examples which when evaluated in IELM print
results without indentation in Emacs 26 and with indentation in Emacs 25:
char-acronym-table
(let ((ht (make-hash-table)))
(puthash 1 '(a b c) ht)
ht)
Oddly, Emacs 26's IELM does indent the result of this one:
(symbol-function 'ielm-process)
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#31984: 26.1.50; IELM doesn't indent results printed with #
2018-06-26 19:42 bug#31984: 26.1.50; IELM doesn't indent results printed with # Gemini Lasswell
@ 2018-06-28 2:01 ` Noam Postavsky
2018-07-19 11:16 ` Noam Postavsky
2018-07-26 11:49 ` Davor Rotim
1 sibling, 1 reply; 7+ messages in thread
From: Noam Postavsky @ 2018-06-28 2:01 UTC (permalink / raw)
To: Gemini Lasswell; +Cc: 31984
retitle 31984 26.1; indent-sexp doesn't indent expressions starting with #
found 31984 26.1
tags 31984 + confirmed
quit
Gemini Lasswell <gazally@runbox.com> writes:
> When the result of evaluation in IELM is something with a printed
> representation beginning with #, such as a record or char-table,
> it is pretty-printed without indentation.
>
> To reproduce, M-x ielm RET and then evaluate this:
>
> (require 'cl-lib)
> (cl-defstruct (foo) a)
> (make-foo :a (lambda (x) (- 1 x)))
>
> Result:
>
> #s(foo :a
> (lambda
> (x)
> (- 1 x)))
Which is because pp-buffer doesn't indent this, which is because
indent-sexp doesn't indent it, which is because indent-sexp now relies
on forward-sexp to find the end, and forward-sexp only goes over the
"#s".
Another example:
With point before the (foo), Emacs 25 indent-sexp turns this
(foo) (blah
etc)
into this
(foo) (blah
etc)
Emacs 26 indent-sexp doesn't do anything from that position. It's less
clear which is correct in that case, but restoring to the Emacs 25
behaviour would fix the #s(...) case as well. Alternatively, we could
fix elisp sexp movement to handle such expressions, which we should
probably do anyway (see also Bug#15998).
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#31984: 26.1.50; IELM doesn't indent results printed with #
2018-06-28 2:01 ` Noam Postavsky
@ 2018-07-19 11:16 ` Noam Postavsky
2018-07-19 19:01 ` Gemini Lasswell
0 siblings, 1 reply; 7+ messages in thread
From: Noam Postavsky @ 2018-07-19 11:16 UTC (permalink / raw)
To: Gemini Lasswell; +Cc: 31984
[-- Attachment #1: Type: text/plain, Size: 680 bytes --]
tags 31984 + patch
quit
Noam Postavsky <npostavs@gmail.com> writes:
> With point before the (foo), Emacs 25 indent-sexp turns this
>
> (foo) (blah
> etc)
>
> into this
>
> (foo) (blah
> etc)
>
> Emacs 26 indent-sexp doesn't do anything from that position. It's less
> clear which is correct in that case, but restoring to the Emacs 25
> behaviour would fix the #s(...) case as well. Alternatively, we could
> fix elisp sexp movement to handle such expressions, which we should
> probably do anyway (see also Bug#15998).
Probably Bug#15998 won't be fixed in Emacs 26, so here's a patch to make
indent-sexp indent the sexp spanning the end of line, like Emacs 25
does.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2506 bytes --]
From 3e206ed6c2c82ef3d147b3dece6dc65ffe1625a2 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Thu, 19 Jul 2018 06:40:54 -0400
Subject: [PATCH] Fix indent-sexp of #s(...) (Bug#31984)
* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Look for a sexp that
ends after the current line.
* test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-go): New test.
---
lisp/emacs-lisp/lisp-mode.el | 10 ++++++++--
test/lisp/emacs-lisp/lisp-mode-tests.el | 12 ++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 3a03b56313..44b27236a9 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1199,8 +1199,14 @@ indent-sexp
(setq endpos (copy-marker
(if endpos endpos
;; Get error now if we don't have a complete sexp
- ;; after point.
- (save-excursion (forward-sexp 1) (point)))))
+ ;; after point. We actually look for a sexp which
+ ;; ends after the current line so that we properly
+ ;; indent things like #s(...). This might not be
+ ;; needed if Bug#15998 is fixed.
+ (let ((eol (line-end-position)))
+ (save-excursion (while (and (< (point) eol) (not (eobp)))
+ (forward-sexp 1))
+ (point))))))
(save-excursion
(while (let ((indent (lisp-indent-calc-next parse-state))
(ppss (lisp-indent-state-ppss parse-state)))
diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el
index 8598d41978..0b052e9fc3 100644
--- a/test/lisp/emacs-lisp/lisp-mode-tests.el
+++ b/test/lisp/emacs-lisp/lisp-mode-tests.el
@@ -113,6 +113,18 @@ lisp-mode-tests--correctly-indented-sexp
;; we're indenting ends on the previous line.
(should (equal (buffer-string) original)))))
+(ert-deftest indent-sexp-go ()
+ "Make sure `indent-sexp' doesn't stop after #s."
+ ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31984.
+ (with-temp-buffer
+ (emacs-lisp-mode)
+ (insert "#s(foo\nbar)\n")
+ (goto-char (point-min))
+ (indent-sexp)
+ (should (equal (buffer-string) "\
+#s(foo
+ bar)\n"))))
+
(ert-deftest lisp-indent-region ()
"Test basics of `lisp-indent-region'."
(with-temp-buffer
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#31984: 26.1.50; IELM doesn't indent results printed with #
2018-07-19 11:16 ` Noam Postavsky
@ 2018-07-19 19:01 ` Gemini Lasswell
2018-07-22 1:30 ` Noam Postavsky
0 siblings, 1 reply; 7+ messages in thread
From: Gemini Lasswell @ 2018-07-19 19:01 UTC (permalink / raw)
To: Noam Postavsky; +Cc: 31984
Noam Postavsky <npostavs@gmail.com> writes:
> Probably Bug#15998 won't be fixed in Emacs 26, so here's a patch to make
> indent-sexp indent the sexp spanning the end of line, like Emacs 25
> does.
I gave this patch a try and it worked well with everything I tried it
on, both in IELM and my new backtrace-mode.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#31984: 26.1.50; IELM doesn't indent results printed with #
2018-06-26 19:42 bug#31984: 26.1.50; IELM doesn't indent results printed with # Gemini Lasswell
2018-06-28 2:01 ` Noam Postavsky
@ 2018-07-26 11:49 ` Davor Rotim
2018-07-28 0:15 ` Noam Postavsky
1 sibling, 1 reply; 7+ messages in thread
From: Davor Rotim @ 2018-07-26 11:49 UTC (permalink / raw)
To: 31984
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
Hello,
this change seems to have broken Paredit, a quick recipe with Paredit
installed:
emacs -Q
M-x package-initialize
M-x enable-paredit-mode
Now just press ( repeatedly, it errors out on the 2nd inserted pair and any
other after that:
forward-sexp: Scan error: "Containing expression ends prematurely", 4, 5
[-- Attachment #2: Type: text/html, Size: 482 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-07-28 0:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-26 19:42 bug#31984: 26.1.50; IELM doesn't indent results printed with # Gemini Lasswell
2018-06-28 2:01 ` Noam Postavsky
2018-07-19 11:16 ` Noam Postavsky
2018-07-19 19:01 ` Gemini Lasswell
2018-07-22 1:30 ` Noam Postavsky
2018-07-26 11:49 ` Davor Rotim
2018-07-28 0:15 ` Noam Postavsky
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.