* bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using
@ 2024-06-05 6:55 Philip Kaludercic
2024-06-05 12:19 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Philip Kaludercic @ 2024-06-05 6:55 UTC (permalink / raw)
To: 71374
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
The main issue with this patch is that it drops the syntax highlighting
in the *string edit* buffer, but we could fix that in a second patch by
adding support to specify a major mode to inherit from when editing a
string.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] Simplify 'help-enable-variable-value-editing' using --]
[-- Type: text/x-patch, Size: 3546 bytes --]
From fa1fff88e295bee0380665d623a6266842f91af6 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Wed, 5 Jun 2024 08:26:37 +0200
Subject: [PATCH] Simplify 'help-enable-variable-value-editing' using
'string-edit'
* lisp/help-fns.el (help-fns--edit-variable): Remove variable
declaration, as 'string-edit' makes manually storing the
variable name unnecessary.
(help-fns-edit-variable): Use 'read-string-from-buffer' instead
of custom major mode.
(help-fns--edit-value-mode-map, help-fns--edit-value-mode)
(help-fns-edit-mode-done, help-fns-edit-mode-cancel): Remove
functionality provided by 'string-edit'.
---
lisp/help-fns.el | 55 ++++++------------------------------------------
1 file changed, 7 insertions(+), 48 deletions(-)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 1ffe1b16588..8ea5b301684 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1502,60 +1502,19 @@ help-fns--editable-variable
:parent button-map
"e" #'help-fns-edit-variable)))))
-(defvar help-fns--edit-variable)
-
(put 'help-fns-edit-variable 'disabled t)
(defun help-fns-edit-variable ()
"Edit the variable under point."
(declare (completion ignore))
(interactive)
- (let ((var (get-text-property (point) 'help-fns--edit-variable)))
- (unless var
+ (let* ((val (thing-at-point 'sexp))
+ (var (get-text-property 0 'help-fns--edit-variable val)))
+ (unless val
(error "No variable under point"))
- (pop-to-buffer-same-window (format "*edit %s*" (nth 0 var)))
- (prin1 (nth 1 var) (current-buffer))
- (pp-buffer)
- (goto-char (point-min))
- (help-fns--edit-value-mode)
- (insert (format ";; Edit the `%s' variable.\n" (nth 0 var))
- (substitute-command-keys
- ";; `\\[help-fns-edit-mode-done]' to update the value and exit; \
-`\\[help-fns-edit-mode-cancel]' to cancel.\n\n"))
- (setq-local help-fns--edit-variable var)))
-
-(defvar-keymap help-fns--edit-value-mode-map
- "C-c C-c" #'help-fns-edit-mode-done
- "C-c C-k" #'help-fns-edit-mode-cancel)
-
-(define-derived-mode help-fns--edit-value-mode emacs-lisp-mode "Elisp"
- :interactive nil)
-
-(defun help-fns-edit-mode-done (&optional kill)
- "Update the value of the variable being edited and kill the edit buffer.
-If KILL (the prefix), don't update the value, but just kill the
-current buffer."
- (interactive "P" help-fns--edit-value-mode)
- (unless help-fns--edit-variable
- (error "Invalid buffer"))
- (goto-char (point-min))
- (cl-destructuring-bind (variable _ buffer help-buffer)
- help-fns--edit-variable
- (unless (buffer-live-p buffer)
- (error "Original buffer is gone; can't update"))
- (unless kill
- (let ((value (read (current-buffer))))
- (with-current-buffer buffer
- (set variable value))))
- (kill-buffer (current-buffer))
- (when (buffer-live-p help-buffer)
- (with-current-buffer help-buffer
- (revert-buffer)))))
-
-(defun help-fns-edit-mode-cancel ()
- "Kill the edit buffer and cancel editing of the value.
-This cancels value editing without updating the value."
- (interactive nil help-fns--edit-value-mode)
- (help-fns-edit-mode-done t))
+ (let ((str (read-string-from-buffer
+ (format ";; Edit the `%s' variable." (nth 0 var))
+ (prin1-to-string (nth 1 var)))))
+ (set (nth 0 var) (read str)))))
(defun help-fns--run-describe-functions (functions &rest args)
(with-current-buffer standard-output
--
2.45.1
[-- Attachment #3: Type: text/plain, Size: 37 bytes --]
--
Philip Kaludercic on peregrine
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using
2024-06-05 6:55 bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using Philip Kaludercic
@ 2024-06-05 12:19 ` Eli Zaretskii
2024-06-06 6:22 ` Philip Kaludercic
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2024-06-05 12:19 UTC (permalink / raw)
To: Philip Kaludercic; +Cc: 71374
> From: Philip Kaludercic <philipk@posteo.net>
> Date: Wed, 05 Jun 2024 06:55:46 +0000
>
> The main issue with this patch is that it drops the syntax highlighting
> in the *string edit* buffer, but we could fix that in a second patch by
> adding support to specify a major mode to inherit from when editing a
> string.
Thanks. This is basically a cleanup, yes? IOW, there's nothing wrong
with the current implementation, right? If so, I'd prefer to wait
with this until after the emacs-30 branch is cut.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using
2024-06-05 12:19 ` Eli Zaretskii
@ 2024-06-06 6:22 ` Philip Kaludercic
2024-06-30 5:38 ` Stefan Kangas
0 siblings, 1 reply; 4+ messages in thread
From: Philip Kaludercic @ 2024-06-06 6:22 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 71374
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Philip Kaludercic <philipk@posteo.net>
>> Date: Wed, 05 Jun 2024 06:55:46 +0000
>>
>> The main issue with this patch is that it drops the syntax highlighting
>> in the *string edit* buffer, but we could fix that in a second patch by
>> adding support to specify a major mode to inherit from when editing a
>> string.
>
> Thanks. This is basically a cleanup, yes? IOW, there's nothing wrong
> with the current implementation, right? If so, I'd prefer to wait
> with this until after the emacs-30 branch is cut.
Right, it just seemed like the kind of thing where it would be natural
to demonstrate string-edit.
--
Philip Kaludercic on peregrine
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using
2024-06-06 6:22 ` Philip Kaludercic
@ 2024-06-30 5:38 ` Stefan Kangas
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Kangas @ 2024-06-30 5:38 UTC (permalink / raw)
To: Philip Kaludercic; +Cc: Eli Zaretskii, 71374
Philip Kaludercic <philipk@posteo.net> writes:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>>> From: Philip Kaludercic <philipk@posteo.net>
>>> Date: Wed, 05 Jun 2024 06:55:46 +0000
>>>
>>> The main issue with this patch is that it drops the syntax highlighting
>>> in the *string edit* buffer, but we could fix that in a second patch by
>>> adding support to specify a major mode to inherit from when editing a
>>> string.
>>
>> Thanks. This is basically a cleanup, yes? IOW, there's nothing wrong
>> with the current implementation, right? If so, I'd prefer to wait
>> with this until after the emacs-30 branch is cut.
>
> Right, it just seemed like the kind of thing where it would be natural
> to demonstrate string-edit.
Feel free to install on master now, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-30 5:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-05 6:55 bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using Philip Kaludercic
2024-06-05 12:19 ` Eli Zaretskii
2024-06-06 6:22 ` Philip Kaludercic
2024-06-30 5:38 ` Stefan Kangas
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).