From: Dmitry Gutov <dgutov@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>
Cc: casouri@gmail.com, 59662@debbugs.gnu.org, theo@thornhill.no,
casouri@gmail.org
Subject: bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun
Date: Thu, 8 Dec 2022 03:37:54 +0200 [thread overview]
Message-ID: <4d605e69-7df9-6480-c1c5-dcb22abd3bde@yandex.ru> (raw)
In-Reply-To: <83wn78cqz4.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
On 03/12/2022 19:54, Eli Zaretskii wrote:
>> paredit-reindent-defun, like I described, does all that too. But when
>> outside strings and comments, it reindents the current defun.
> So maybe paredit-reindent-defun doesn't need any fixes, but using it as a
> role model for the C-like languages is not TRT, since in C these are two
> separate commands with two different key bindings.
It's not a given that the current state of things must automatically be
optimal. But of course I can't vouch whether this behavior is optimal
for every language.
And major modes will continue to be able to rebind these key sequences.
>> AFAICT, these behaviors are quite compatible. But paredit's binding
>> seems to be useful in more contexts.
> I'm fine with trying something like that on master, to see whether users
> like this conflation, but not on the release branch.
Here's a patch that people can try. From my brief testing, seems useful
enough. I suppose some might dislike it, though, in some codebases where
the methods/functions are consistently longer than a screenful. I do
like this binding in Emacs Lisp too, though.
[-- Attachment #2: prog-reindent-defun.diff --]
[-- Type: text/x-patch, Size: 1559 bytes --]
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 58cb48f182..46bacea737 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -102,7 +102,8 @@ prog-context-menu
(defvar-keymap prog-mode-map
:doc "Keymap used for programming modes."
- "C-M-q" #'prog-indent-sexp)
+ "C-M-q" #'prog-indent-sexp
+ "M-q" #'prog-reindent-defun)
(defvar prog-indentation-context nil
"When non-nil, provides context for indenting embedded code chunks.
@@ -144,6 +145,26 @@ prog-first-column
"Return the indentation column normally used for top-level constructs."
(or (car prog-indentation-context) 0))
+(defun prog-reindent-defun (&optional argument)
+ "Refill paragraph or reindent the definition that the point is on.
+
+If the point is in a string, or in a comment, or there is a
+comment on the current line, fill the paragraph that the point is
+in or is on the same line.
+
+Otherwise, reindent the definition around or below point."
+ (interactive "P")
+ (save-excursion
+ (if (or (nth 8 (syntax-ppss))
+ (re-search-forward comment-start-skip (line-end-position) t))
+ (if (memq fill-paragraph-function '(t nil))
+ (lisp-fill-paragraph argument)
+ (funcall fill-paragraph-function argument))
+ (end-of-defun)
+ (let ((end (point)))
+ (beginning-of-defun)
+ (indent-region (point) end)))))
+
(defvar-local prettify-symbols-alist nil
"Alist of symbol prettifications.
Each element looks like (SYMBOL . CHARACTER), where the symbol
next prev parent reply other threads:[~2022-12-08 1:37 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 19:32 bug#59662: 29.0.50; [PATCH] Add treesit--indent-defun Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
[not found] ` <handler.59662.B.16696639455818.ack@debbugs.gnu.org>
2022-11-29 6:10 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-29 12:01 ` Eli Zaretskii
2022-11-29 12:14 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-29 14:15 ` Eli Zaretskii
2022-11-30 10:33 ` Yuan Fu
2022-11-30 23:23 ` Yuan Fu
2022-12-01 1:07 ` Yuan Fu
2022-12-01 7:19 ` Eli Zaretskii
2022-12-01 6:10 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01 7:13 ` Eli Zaretskii
2022-12-01 7:22 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01 7:48 ` Eli Zaretskii
2022-12-01 8:13 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 15:06 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 15:45 ` Eli Zaretskii
2022-12-02 18:32 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 18:52 ` Eli Zaretskii
2022-12-02 19:02 ` Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 20:24 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 21:09 ` Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 21:19 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-04 12:33 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-04 12:40 ` Eli Zaretskii
2022-12-07 9:31 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 13:44 ` Eli Zaretskii
2022-12-02 19:53 ` Dmitry Gutov
2022-12-02 20:01 ` Dmitry Gutov
2022-12-02 20:07 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-02 22:27 ` Dmitry Gutov
2022-12-03 6:47 ` Eli Zaretskii
2022-12-03 15:59 ` Dmitry Gutov
2022-12-03 17:54 ` Eli Zaretskii
2022-12-08 1:37 ` Dmitry Gutov [this message]
2022-12-08 7:16 ` Eli Zaretskii
2022-12-08 8:11 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 8:27 ` Eli Zaretskii
2022-12-08 8:56 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 9:08 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 10:39 ` Eli Zaretskii
2022-12-08 11:09 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 11:38 ` Eli Zaretskii
2022-12-08 14:22 ` Dmitry Gutov
2022-12-08 14:58 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 16:06 ` Dmitry Gutov
2022-12-08 16:33 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:03 ` Dmitry Gutov
2022-12-08 14:18 ` Dmitry Gutov
2022-12-08 14:53 ` Eli Zaretskii
2022-12-08 15:43 ` Dmitry Gutov
2022-12-08 16:04 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 16:23 ` Dmitry Gutov
2022-12-08 19:15 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 19:50 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 20:12 ` Eli Zaretskii
2022-12-08 21:21 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 5:06 ` Eli Zaretskii
2022-12-09 13:24 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 13:38 ` Dmitry Gutov
2022-12-09 14:46 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 14:56 ` Dmitry Gutov
2022-12-09 15:13 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 15:27 ` Dmitry Gutov
2022-12-09 15:29 ` Dmitry Gutov
2022-12-09 15:50 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 16:05 ` Dmitry Gutov
2022-12-09 19:15 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 20:28 ` Dmitry Gutov
2022-12-09 20:31 ` Dmitry Gutov
2022-12-09 20:20 ` Eli Zaretskii
2022-12-09 20:30 ` Dmitry Gutov
2022-12-10 14:04 ` Eli Zaretskii
2022-12-10 19:25 ` Dmitry Gutov
2022-12-09 21:09 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-10 12:02 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-10 14:27 ` Eli Zaretskii
2022-12-10 14:09 ` Eli Zaretskii
2022-12-10 20:21 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11 8:11 ` Eli Zaretskii
2022-12-11 8:39 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11 10:03 ` Eli Zaretskii
2022-12-11 14:13 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-11 20:36 ` Dmitry Gutov
2022-12-11 20:39 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:05 ` Dmitry Gutov
2022-12-08 22:10 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-08 22:49 ` Dmitry Gutov
2022-12-08 14:24 ` Dmitry Gutov
2022-12-08 15:37 ` Dmitry Gutov
2022-12-08 15:46 ` Eli Zaretskii
2022-12-07 19:54 ` Yuan Fu
2022-12-07 20:06 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 21:40 ` Yuan Fu
2022-12-07 21:53 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-07 23:09 ` Yuan Fu
2022-12-08 6:02 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-07 23:01 ` Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d605e69-7df9-6480-c1c5-dcb22abd3bde@yandex.ru \
--to=dgutov@yandex.ru \
--cc=59662@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=casouri@gmail.org \
--cc=eliz@gnu.org \
--cc=theo@thornhill.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.