From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Eglot to core [Was: rmsbolt.el [Was: Colorful line numbers]] Date: Sun, 24 Jul 2022 19:58:52 +0100 Message-ID: <874jz6mj6b.fsf@gmail.com> References: <87leslpow2.fsf@gmail.com> <83ilnpl8e0.fsf@gnu.org> <874jz9peq0.fsf@gmail.com> <837d45l6ge.fsf@gnu.org> <87zgh1nyo6.fsf@gmail.com> <831qudl1k3.fsf@gnu.org> <87v8rpntiv.fsf@gmail.com> <83sfmtjjy8.fsf@gnu.org> <87fsitnpxd.fsf@gmail.com> <83k085jgxr.fsf@gnu.org> <87tu77vq1a.fsf@eve> 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="38088"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Stefan Kangas , Eli Zaretskii , emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jul 24 20:59:10 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oFgon-0009cL-7u for ged-emacs-devel@m.gmane-mx.org; Sun, 24 Jul 2022 20:59:09 +0200 Original-Received: from localhost ([::1]:48842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFgom-0007xb-8S for ged-emacs-devel@m.gmane-mx.org; Sun, 24 Jul 2022 14:59:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFgnO-0006kv-7c for emacs-devel@gnu.org; Sun, 24 Jul 2022 14:57:43 -0400 Original-Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33606) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFgnM-0003Ij-DY; Sun, 24 Jul 2022 14:57:41 -0400 Original-Received: by mail-wr1-x434.google.com with SMTP id h9so13230690wrm.0; Sun, 24 Jul 2022 11:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :user-agent:mime-version:content-transfer-encoding; bh=1sOB2+sC8uftbEe4NnV9mNV7zVoU/NbTtLUDzeykBN0=; b=DwNnVuEpz4kUy2WK9g6mj1G8RfDp+q9xEL0UpfSkq8Egn28ZmNJP6/L/kdwuwwInYX uH2+Bs+1I3XYh5tK5YfXkPCO8Et63Y1TediI3pqhIsGFYWBXc15Y5sm0tbnE+Mcp9DU7 yzP6cjXXYCkTGT47MXJ7HhXMmwFW2riInVPo8z6VqiXro0MyFcwp8Wg1i2GKhSgTTV9J ftISFweh4hFagM4Sctem5Wpu7k85wndDOPWqgcOV8SYwxeYo65/E11QVyQomtYgOBFZ0 LMvK5gV3VRPuRZo20hsdxxK+5VRvxAvFqooWO/8XiEa/d/dhhhrp4qSNMLdCAoZmi/Wh wgfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:user-agent:mime-version:content-transfer-encoding; bh=1sOB2+sC8uftbEe4NnV9mNV7zVoU/NbTtLUDzeykBN0=; b=6NOdtqLGC/bxDWZdb7S7hS2qXxLnnu355p0aPIQseCrTXXS8zGhY+Apl1JBCZDqWo5 HEho38LLxrs6veMUx91spUgN4hp2p5FYqm14qLailYJKCXMnHkahspS1eNldaev2Rwcp 4Fa3kdI/3QhHAKMf5DxkOwLhssiiyESaKp+krfJ0Nq8RAZeshq+XOxFGjQrlniNfdBLp YlkKRdjwHR8NXWnNHMsvxgIgeRVkb8pAXR5D1bHjJNSczhB3Tx8/Z4Ti9hbJ7Msh9WKV EPK1LRfCNE4Ut2y+oJ2X5Mmq76vUdlzMHhaEZFuiF2uWaI06JGaCyxUAwr/8DMEV/y3p /q9Q== X-Gm-Message-State: AJIora++9+bsQpKtVRfzNTiVg1m/rZ9jUzvW/B2rtA8NkubiiMH8cm/y mum9pNYIX4vw+kId+gOeuUSk3qfhVj8= X-Google-Smtp-Source: AGRyM1tnBjso+uw1plNr0EDM3W/+Uom6NysMB8xPQhy6GQMpXiqM1q4AYgk4wT6DXgo8U126OgzblQ== X-Received: by 2002:a05:6000:68f:b0:21d:928e:d0cd with SMTP id bo15-20020a056000068f00b0021d928ed0cdmr5764456wrb.539.1658689057677; Sun, 24 Jul 2022 11:57:37 -0700 (PDT) Original-Received: from krug (87-196-74-31.net.novis.pt. [87.196.74.31]) by smtp.gmail.com with ESMTPSA id s2-20020adff802000000b0021e4edba1e5sm10146627wrp.111.2022.07.24.11.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jul 2022 11:57:37 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Sat, 23 Jul 2022 13:52:12 -0400") Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=joaotavora@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:292614 Archived-At: Stefan Monnier writes: > So, yes, `eglot` in GNU ELPA is now stuck and you'll have to merge > `c558fd6a24` back into your upstream repo before it will start tracking > it again :-( OK done. Let me know when it's running again. >> Speaking of that, I'd like to get started with this sometime soon (maybe >> August, around the corner). I wonder if you know any Git technique that >> allows me to keep the history, at least of eglot.el so that is merged wi= th >> Emacs's own history. There was some `git subtree` command to do this >> right? > > As a one-time thing it's pretty easy. You don't really need `git > subtree` for that. Just do something like: > > git merge --no-commit --allow-unrelated-histories .../eglot > git mv eglot.el lisp/ > ... > git commit OK this indeed sounds simple. lisp/eglot.el sounds fine I suppose the tests would go to test/lisp/eglot-tests.el What about the manual rewritten from the README? A new section in the Emacs user manual or a separate manual like Flymake's (the latter has the unfortunate flaw that it isn't indexed by C-h S). What about the Eglot NEWS file? Should I trash it or is there some place to put it/or integrate it? > Keeping it up if you keep hacking on the upstream is IMO an unsolved > problem (there are various hacks you can use, but they all suck one way > or another). I plan to hacking in Emacs core, i.e. make commits to emacs.git. Not in Eglot's github upstream. However, I _would_ like the upstream to track eglot.el from emacs.git (only that file will do), since I suspect some people still get it from there. Also often people submit pull requests to that repo, and if the eglot.el file is up-to-date all I have to do is extract a patch and commit to emacs.git. I also wanted to give some grace time to users who file bug reports in the upstream repo for some time, but that's an easier administrative issue. What do you think of this plan, is it feasible? Jo=C3=A3o