From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#60379: [PATCH] Eglot: don't use "nil" as minibuffer initial input Date: Sat, 14 Jan 2023 10:16:03 +0200 Message-ID: <83edrx8rb0.fsf@gnu.org> References: <83ilhcksk6.fsf@gnu.org> <878ri8t5p0.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5182"; mail-complaints-to="usenet@ciao.gmane.io" Cc: me@eshelyaron.com, 60379-done@debbugs.gnu.org To: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 14 09:17:12 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 1pGbix-0001BU-La for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 14 Jan 2023 09:17:11 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGbiq-0002i2-KM; Sat, 14 Jan 2023 03:17:04 -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 1pGbip-0002hI-4N for bug-gnu-emacs@gnu.org; Sat, 14 Jan 2023 03:17: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 1pGbio-00062j-SA for bug-gnu-emacs@gnu.org; Sat, 14 Jan 2023 03:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGbio-0003Pg-Mj for bug-gnu-emacs@gnu.org; Sat, 14 Jan 2023 03:17:02 -0500 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Jan 2023 08:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 60379 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 60379@debbugs.gnu.org, eliz@gnu.org, me@eshelyaron.com Original-Received: via spool by 60379-done@debbugs.gnu.org id=D60379.167368417213046 (code D ref 60379); Sat, 14 Jan 2023 08:17:02 +0000 Original-Received: (at 60379-done) by debbugs.gnu.org; 14 Jan 2023 08:16:12 +0000 Original-Received: from localhost ([127.0.0.1]:53250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGbi0-0003OL-6x for submit@debbugs.gnu.org; Sat, 14 Jan 2023 03:16:12 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:52412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGbhy-0003O7-Bm for 60379-done@debbugs.gnu.org; Sat, 14 Jan 2023 03:16:10 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGbhs-0005s9-S8; Sat, 14 Jan 2023 03:16:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=QRnwVMce0vnlPZ6S1VkPMxPGnx5ujI/XNphkAD4eMG8=; b=ZfGng4U2URGnYf3T8ywc 5R/kU6EUKUcok5VSWdlu+/YPDU3nVgV6ptefcjTU5Hh5+sD9UoceN5S1rWNsDKJ16gEQjVbqdh+7Q 4AUt9E5SI2tM4WOjQGUZY1Qw+05vWXQG1F+TRndOU16BOGJyQpM9sy3q2GXKJBpKa1l9wvXKpSs+3 aQ65ePn262RgRZVt+P1kVb/yjrtCy5Bjzz1NVqFyay2MO897SGalMEWGSzQKZk7dvnnaUPvK3r/hu xgZ9jS+jkNhdUlIkuJV2Q2ms6M+r4SZp3XmdH0k/vqDn1+EpacChir3I2StkfcxCr4kDmoeTpqqmj TSMA9MKn62nK6g==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGbhr-0008DS-Kf; Sat, 14 Jan 2023 03:16:04 -0500 In-Reply-To: <878ri8t5p0.fsf@gmail.com> (message from =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= on Thu, 12 Jan 2023 10:20:27 +0000) 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:253337 Archived-At: > From: João Távora > Cc: Eshel Yaron , 60379@debbugs.gnu.org > Date: Thu, 12 Jan 2023 10:20:27 +0000 > > 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) nil))) > + guessed-mode-name nil guessed-mode-name nil))) > ((not guessed-mode) > (eglot--error "Can't guess mode to manage for `%s'" (current-buffer))) > (t guessed-mode))) > > Other than that, it's fine to commit. OK, done, and closing the bug. Yaron, this change was small enough to accept without copyright assignment, but if you intend to continue contributing to Emacs (and we hope you do), I recommend to start your copyright assignment paperwork rolling at this time. If you agree, I will send you the form to fill and the instructions to email it. Thanks.