From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#71374: [PATCH] Simplify 'help-enable-variable-value-editing' using Date: Mon, 12 Aug 2024 11:51:18 +0000 Message-ID: <87y152j6x5.fsf@posteo.net> References: <87ikync1zh.fsf@posteo.net> <86frtrk2ec.fsf@gnu.org> <8734pqbneq.fsf@posteo.net> <871q3xklgv.fsf@jeremybryant.net> <87msm1pvsj.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6169"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 71374@debbugs.gnu.org To: Eshel Yaron Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 12 13:52:54 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sdTbY-0001TS-SP for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Aug 2024 13:52:52 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdTbN-0007sU-4Z; Mon, 12 Aug 2024 07:52:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdTbD-0007q4-TI for bug-gnu-emacs@gnu.org; Mon, 12 Aug 2024 07:52:32 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sdTbB-00007D-VM for bug-gnu-emacs@gnu.org; Mon, 12 Aug 2024 07:52:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=q5PX2K4rQn7TKfuM5JwQJRiMLIi430GKrO3uOqHdOxE=; b=XanaXSB5NC5oK4e6frOj86gokdlS4NvDYRP5sBrTrpAeBi76oeQhCGOGpbqJivTZgt9d9cGzNXq2aUa4W1n5RgSixcxY6CxBh6ELGl+oEpOB+gdeSmAEQjDQ7geJPc423KkKO30G4cXH/mwkKgNBkb6tCKswYJPCCOMtkbVmDhdFUdDAHDw5imyWpXG4Z5m9/IMR2/OBQnqX9/zwLAd2G9/gi99J4ijYDjto5bASHMYJfHIVlnwNIb/KXG+i12TCBU6a4SB2RY/dbx5PPGeAw4WLoDT5Pm/e/aP2ixOLMaDZujEoUpiOXFoSv3T8Rm+ZtH3os03yytYr5/u0ZhzyKA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sdTbh-0001dV-Rw for bug-gnu-emacs@gnu.org; Mon, 12 Aug 2024 07:53:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Aug 2024 11:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71374 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 71374-submit@debbugs.gnu.org id=B71374.17234635346205 (code B ref 71374); Mon, 12 Aug 2024 11:53:01 +0000 Original-Received: (at 71374) by debbugs.gnu.org; 12 Aug 2024 11:52:14 +0000 Original-Received: from localhost ([127.0.0.1]:42551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sdTaw-0001bx-AE for submit@debbugs.gnu.org; Mon, 12 Aug 2024 07:52:14 -0400 Original-Received: from [185.67.36.65] (port=52189 helo=mout01.posteo.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sdTas-0001bB-DJ for 71374@debbugs.gnu.org; Mon, 12 Aug 2024 07:52:12 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C1752240027 for <71374@debbugs.gnu.org>; Mon, 12 Aug 2024 13:51:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1723463480; bh=azGe+oCH4zVYx1QyfD5uso71kTVF3R6XTLYaUv+tVms=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=WI+YkX6HqwpTZp2L+H+Wn65fFqkCXsyMJBYa4ugdlqIuenEDjhEPsczSm8saz85Ji JVB5ngWyGVLgbU/ZzvCDxZpRAIL0hbwCuCyl0BValJCEtzlGy7kzpG6z7hiQIVhL/2 6gYiO21OV47aAosIECwZ8LEfj33FP12avZq5vZZ4EX1x+4nXsbkQWzEfAstZ5+NB+t hszF9j2bWkx4jjH7z3HRKah+1QKfZDr0uLkAeGZrvYP4Z+ibKY+cBVR67bUmu0017p yEx728ngrRoJOnJiiKhTfqBfnac7zTrOTBFXHUql8zx6Vg1i1dOVt4j95g/MhLNUnu viQsjzwEw1sBA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WjCXR6TScz6tm8; Mon, 12 Aug 2024 13:51:19 +0200 (CEST) In-Reply-To: (Eshel Yaron's message of "Fri, 02 Aug 2024 11:03:46 +0200") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290045 Archived-At: --=-=-= Content-Type: text/plain Eshel Yaron writes: > reopen 71374 > quit > > Hi Philip, > > Philip Kaludercic writes: > >> I hadn't pushed the change, have done so now. Closing the report. >> Thanks for the reminder. > > I'm reopening this (hope you don't mind) to keep track of the minor > regressions I mentioned here: > > https://lists.gnu.org/archive/html/emacs-devel/2024-07/msg01202.html Thanks, and my apologies for the late reply. The issue seems to be that (thing-at-point 'sexp) returns nil if inside a s-expression looking at whitespace: (1 2 3 4 5) ^ M-: (thing-at-point 'sexp) ;=> nil One idea is to fall back on a defun at point, if no sexp is found: --=-=-= Content-Type: text/plain Content-Disposition: inline diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 8ea5b301684..4d55ea8bbff 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1507,13 +1507,14 @@ help-fns-edit-variable "Edit the variable under point." (declare (completion ignore)) (interactive) - (let* ((val (thing-at-point 'sexp)) - (var (get-text-property 0 'help-fns--edit-variable val))) + (let ((val (or (thing-at-point 'sexp) + (thing-at-point 'defun)))) (unless val - (error "No variable under point")) - (let ((str (read-string-from-buffer - (format ";; Edit the `%s' variable." (nth 0 var)) - (prin1-to-string (nth 1 var))))) + (error "No value at point")) + (let* ((var (get-text-property 0 'help-fns--edit-variable val)) + (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) --=-=-= Content-Type: text/plain Additionally, I moved the `get-text-property' after the check, to ensure that the indented error message is used. Comments? > > Thanks, > > Eshel -- Philip Kaludercic on peregrine --=-=-=--