Regarding the fontlockhang, these have been merged in to the main/master branch already. I just manually compared matlab.el between and the fontlock improvements are in the tip.
The fontlockhang branch can be deleted. Note, in MathWorks we are using the current matlab-emacs tip minus a few items that no longer work such as the cedet items. Once we get matlab-emacs into github, I'll update it with improvements such as good org mode support and LSP support. Thanks, John ________________________________ From: Eric Ludlam <ericlud...@gmail.com> Sent: Thursday, August 1, 2024 1:59 PM To: Uwe Brauer <o...@mat.ucm.es> Cc: matlab-emacs-discuss <matlab-emacs-discuss@lists.sourceforge.net> Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted Regarding finding differences between a branch and main/master. I was trying to remind myself what the changes were. Thus, just a diff between branch tip and main/master from whence the branch was created. (ie - what did I change). Then I could check main/master to see if that change was already merged (in the case of the fontlock branch). I know how to do it from the command line (or more accurately, I know how to look up how to do it), but I didn't have a clone handy at the time and was hoping to use the web interface for a quick check and not delay replying. I can dig in more soon to find the answers when I get some other tasks off my plate. Eric On Thu, Aug 1, 2024 at 11:16 AM Uwe Brauer <o...@mat.ucm.es<mailto:o...@mat.ucm.es>> wrote: >>> "UB" == Uwe Brauer <o...@mat.ucm.es<mailto:o...@mat.ucm.es>> writes: >>> "EL" == Eric Ludlam <ericlud...@gmail.com<mailto:ericlud...@gmail.com>> >>> writes: >> Removing those 3 items are fine with me. Here are some details. >> * I'm pretty sure fontlockhang was used by John to solve problems at >> MathWorks. I thought John then recommended the fixes be merged into >> mainline after that. > I would like to clarify these issues before we move to github > Hm, ok @John, what do you say? Shall (and can) this branch be merged > into master (in sourceforge)? Can you do that? >> * wisent-parser is a dead end and is fine to delete > Ok. >> * shell-complete I just don't recall what that is. Maybe there is >> something useful in there but I don't remember enough about it to advise. >> I was looking to use the sourceforge interface to show what was different >> about each branch from where it was branched from, but I didn't see an easy >> way to do that. That would make it much easier to verify my assumptions >> about fontlockhang, or guess at what shell-complete was about. Is there an >> easy way to do that? I just realize that maybe I misunderstood you, do you want to see which files have been changed in each commit in that branch, or do you want to have a diff of the latest commit in master with each commit in that branch? -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine.
_______________________________________________ Matlab-emacs-discuss mailing list Matlab-emacs-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matlab-emacs-discuss
