Re: [Matlab-emacs-discuss] Removing extra lines from collect-command-output

[Uwe B. <ou...@ma...>]

>>> "Eric" == Eric Ludlam <Eri...@ma...> writes:

   > Hi Uwe,
   > Are you not getting email from the matlab-emacs-discuss mailing list?

That is odd indeed.
   > I'm re-attaching the diffs to this email.

Hm does not work. This time patch did not refuse it outright as last
time but I obtain.
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file company-matlab-shell.el.rej

And similar for matlab.el

Ok I see what happens (and why I hate git).
In the official repos
github
sf

The last commit is mine.

Git log gives

commit 3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0
Author: Uwe Brauer <ou...@ma...>
Date:   Fri Sep 2 11:59:06 2016 +0000

    * tlc.el: Add space to
    ;;;###autoload(add-to-list 'auto-mode-alist '("\\.tlc$" .tlc-mode))
                                                                     ^^^
    thanks to John Ciolfi

However in my local repos I still have three commits
by John Ciolfi, namely (using hg)


  changeset:   167:ea809ae422ac
|  bookmark:    proposed_changes
|  tag:         tip
|  user:        John Ciolfi <ci...@ma...>
|  date:        Tue Oct 18 10:18:15 2016 -0400
|  summary:     Added custom completions, fixed typos
|
o  changeset:   166:0d6ad456b544
|  user:        John Ciolfi <ci...@ma...>
|  date:        Mon Oct 10 20:43:17 2016 -0400
|  summary:     matlab-load.el is a generated file
|
o  changeset:   165:96cee86a0430
|  user:        John Ciolfi <ci...@ma...>
|  date:        Mon Oct 10 20:39:21 2016 -0400
|  summary:     Fixed TAB completion, debugging updates, warning fixes

which sit as I understand in the branch (bookmark in hg speach)
proposed_changes. (That I would have failed to identify that these 3
commits belong to a different branch would not have happened in
mercurial using named branches, but I don't want to open a flamewar).

I can apply Nathan patch to master but not to the latest commit in that
branch. I think I will commit and push Nathan Changes, and could merge
in later John's changes from his branch.

Did anybody try out the commits in this branch? I seem now to remember
vaguely an email form him mentioning his changes and that he would put
in a branch. I am not even sure that I tested his changes.

Any thoughts before I push? I might wait a day or so more to hear
opinions. 

Uwe