unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "João Távora" <joaotavora@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Stefan Kangas <stefan@marxist.se>,  Eli Zaretskii <eliz@gnu.org>,
	emacs-devel <emacs-devel@gnu.org>
Subject: Re: Eglot to core [Was: rmsbolt.el [Was: Colorful line numbers]]
Date: Sun, 24 Jul 2022 19:58:52 +0100	[thread overview]
Message-ID: <874jz6mj6b.fsf@gmail.com> (raw)
In-Reply-To: <jwvh7373eqs.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sat, 23 Jul 2022 13:52:12 -0400")

Stefan Monnier <monnier@iro.umontreal.ca> 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 with
>> 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ão






  reply	other threads:[~2022-07-24 18:58 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-22  7:50 Colorful line numbers João Távora
2022-07-22 11:00 ` Eli Zaretskii
2022-07-22 11:29   ` João Távora
2022-07-22 11:42     ` Eli Zaretskii
2022-07-22 12:02       ` João Távora
2022-07-22 13:27         ` Eli Zaretskii
2022-07-22 13:53           ` João Távora
2022-07-22 14:33             ` Eli Zaretskii
2022-07-22 15:10               ` João Távora
2022-07-22 15:38                 ` Eli Zaretskii
2022-07-22 16:30                   ` rmsbolt.el [Was: Colorful line numbers] João Távora
2022-07-22 19:53                     ` Stefan Monnier
2022-07-23  6:13                     ` Eli Zaretskii
2022-07-23  9:35                       ` João Távora
2022-07-23 10:25                         ` Eli Zaretskii
2022-07-23 14:43                           ` Stefan Monnier
2022-07-23 15:52                             ` Eli Zaretskii
2022-07-23 16:31                               ` Stefan Monnier
2022-07-23 17:07                                 ` Colorful line numbers Eli Zaretskii
2022-07-23 18:18                                 ` rmsbolt.el [Was: Colorful line numbers] João Távora
2022-07-23 18:11                           ` João Távora
2022-07-23 14:53                     ` Jay Kamat
2022-07-23 17:25                       ` Stefan Monnier
2022-07-23 17:34                         ` Eglot to core [Was: rmsbolt.el [Was: Colorful line numbers]] João Távora
2022-07-23 17:52                           ` Stefan Monnier
2022-07-24 18:58                             ` João Távora [this message]
2022-07-24 19:04                               ` Stefan Monnier
2022-07-25  1:05                               ` Po Lu
2022-07-25  2:45                                 ` Stefan Monnier
2022-07-25  5:55                                   ` Philip Kaludercic
2022-07-25 15:31                                     ` Stefan Monnier
2022-07-25  6:23                                   ` Po Lu
2022-07-25 10:49                                     ` Bozhidar Batsov
2022-07-25 11:01                                     ` João Távora
2022-07-25 11:50                                       ` Felician Nemeth
2022-07-25 12:27                                         ` João Távora
2022-07-25 12:29                                           ` João Távora
2022-07-25 15:00                                           ` Felician Nemeth
2022-07-25 15:41                                             ` João Távora
2022-07-26  8:12                                               ` Felician Nemeth
2022-07-26  8:21                                                 ` João Távora
2022-07-26  8:55                                                   ` Felician Nemeth
2022-07-25 16:07                                       ` Max Brieiev
2022-07-25 17:05                                         ` João Távora
2022-07-25 15:33                                     ` Stefan Monnier
2022-07-22 12:18 ` Colorful line numbers Dmitry Gutov
2022-07-22 12:38 ` Stefan Monnier
2022-07-22 13:41   ` Dmitry Gutov
2022-07-22 14:01     ` João Távora
2022-07-22 23:32     ` Stefan Monnier
2022-07-23 18:50       ` Dmitry Gutov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874jz6mj6b.fsf@gmail.com \
    --to=joaotavora@gmail.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    --cc=stefan@marxist.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).