From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Newsgroups: gmane.emacs.bugs Subject: bug#60379: [PATCH] Eglot: don't use "nil" as minibuffer initial input Date: Thu, 12 Jan 2023 10:20:27 +0000 Message-ID: <878ri8t5p0.fsf@gmail.com> References: <83ilhcksk6.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22778"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eshel Yaron , 60379@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 12 12:22:33 2023 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 1pFvfF-0005YP-5K for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 12 Jan 2023 12:22:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFugn-0008OX-O8; Thu, 12 Jan 2023 05:20:06 -0500 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 1pFugl-0008Nb-B7 for bug-gnu-emacs@gnu.org; Thu, 12 Jan 2023 05:20:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFugk-0007nX-Nv for bug-gnu-emacs@gnu.org; Thu, 12 Jan 2023 05:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFugk-0008C7-FP for bug-gnu-emacs@gnu.org; Thu, 12 Jan 2023 05:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Jan 2023 10:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60379 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 60379-submit@debbugs.gnu.org id=B60379.167351874331423 (code B ref 60379); Thu, 12 Jan 2023 10:20:02 +0000 Original-Received: (at 60379) by debbugs.gnu.org; 12 Jan 2023 10:19:03 +0000 Original-Received: from localhost ([127.0.0.1]:44753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFufn-0008Aj-Au for submit@debbugs.gnu.org; Thu, 12 Jan 2023 05:19:03 -0500 Original-Received: from mail-wm1-f50.google.com ([209.85.128.50]:53168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFufj-0008AD-HI for 60379@debbugs.gnu.org; Thu, 12 Jan 2023 05:19:02 -0500 Original-Received: by mail-wm1-f50.google.com with SMTP id ay40so12838405wmb.2 for <60379@debbugs.gnu.org>; Thu, 12 Jan 2023 02:18:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tR5oOXRgd3umAzBiEI+iVyeAeh/mb8yam/X+k0lbfkA=; b=UxqN9HjnCjRw83xlje9dBoqSLg427NIzkNQd8RLYdPQMBD1NM/6oDT7ktFDcQSYEW/ vqPV22f6lN6pxi4KUI9GTf5ztGACuZsLo3l3ujfZpbN8gH9HvujMs+eSUaEoDtgy7arI cs1I6sfGX2wY9akoc8TX45RM0DoK/6b7qrCgwPeGxvqwFMksVFR8Ebk91bQZlGcixaXQ 1YDvVgpL3HF08HC/uEvBYR1eX1V89rNt1wJekQxNPkoepI3HGvUz+r7IuvNYRU7YtPFF JOjUf8MCYtvC/bQayTOn9vCQO6C5Ff6+6X5Re+5yC4DXPR+3pUrOiuKm0S1RHQhkaYuI o8Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tR5oOXRgd3umAzBiEI+iVyeAeh/mb8yam/X+k0lbfkA=; b=gpsjLKW6+rUC7Q7+hyKzIFgDnEe6fZxo4HN98sU8el9jVDyRipywtz9Sf6ydU7hmFy mdAC/I/haoKbEdPUboYCn3cXcnGBVzZNYWYA184PXMDq59b8xMJeIZ4oKT9zMQG/LrG1 K/0hkiUAGH5litETzJBpvSnyQXO1vXR1MybMzPZuChVAQMeHxURw9N5GGLglwu/dRPg9 7tsP1a5JgHW0YKZBjuUiw5tuErPwZ9Lg8bIdQqcQjfsaG7z2ImyyNlU/k6gxCzLXPG50 MsPnRf468K7bkttw3oPPpJAwav6uLGhv0kgTiJg0wAAKK66Zf30yE89ZC8CcXyaOG9+S lJjQ== X-Gm-Message-State: AFqh2kqRGtQHY+7qkuanF8/HiRqXLm8iNG41qcSvPNPVdndWYcvXJxH6 iqKfuM86vSHr8/GWJ+aEtLo/iBufWpM= X-Google-Smtp-Source: AMrXdXvTowtlRf6bWf1JlY3GuoiA8JvF3wJahmwnxFimUUz1ppi/AIoZzfz278Eq73ED4q0NsDlqEg== X-Received: by 2002:a05:600c:4f12:b0:3d9:f9ef:3d23 with SMTP id l18-20020a05600c4f1200b003d9f9ef3d23mr6943677wmq.23.1673518733238; Thu, 12 Jan 2023 02:18:53 -0800 (PST) Original-Received: from krug (87-196-72-225.net.novis.pt. [87.196.72.225]) by smtp.gmail.com with ESMTPSA id v8-20020a05600c444800b003c21ba7d7d6sm23137298wmn.44.2023.01.12.02.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 02:18:52 -0800 (PST) In-Reply-To: <83ilhcksk6.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 12 Jan 2023 11:31:21 +0200") 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:253216 Archived-At: Eli Zaretskii writes: >> Date: Wed, 28 Dec 2022 14:22:17 +0200 >> From: Eshel Yaron via "Bug reports for GNU Emacs, >> the Swiss army knife of text editors" >>=20 >> Currently, doing emacs -Q and followed by M-x eglot in the scratch >> buffer results in a prompt for major mode to manage with LSP, but the >> initial minibuffer input as well as the default value for the >> completing-read call are both set to the string "nil", which is not very >> helpful as that's not a valid input. >>=20 >> This patch tweaks the prompt a little and avoids this issue by leaving >> the minibuffer's initial input empty and making sure we don't set the >> default value to "nil" either. > > Jo=C3=A3o, are you looking into this? WDYT? No, I wasn't until now. The idea looks sane, but I think 'format-prompt' can't be used if Eglot is to continue supporting Emacs 26 and 27. Also I'd prefer if the patch is slightly less disruptive to whitespace, like this: diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 15cb1b6fad..eb3b51ed8b 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -991,6 +991,7 @@ eglot--guess-contact non-nil, maybe prompt user, else error as soon as something can't be guessed." (let* ((guessed-mode (if buffer-file-name major-mode)) + (guessed-mode-name (and guessed-mode (symbol-name guessed-mode))) (main-mode (cond ((and interactive @@ -1000,7 +1001,7 @@ eglot--guess-contact (completing-read "[eglot] Start a server to manage buffers of what major mode= ? " (mapcar #'symbol-name (eglot--all-major-modes)) nil t - (symbol-name guessed-mode) nil (symbol-name guessed-mode) ni= l))) + guessed-mode-name nil guessed-mode-name nil))) ((not guessed-mode) (eglot--error "Can't guess mode to manage for `%s'" (current-b= uffer))) (t guessed-mode))) Other than that, it's fine to commit. Jo=C3=A3o