Re: How about a release?

2018-04-26 Fir de Conversatie Bram Moolenaar
Phil Dobbin wrote: > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is there is something important that should still be included? > > Or something in the

Re: How about a release?

2018-04-25 Fir de Conversatie Phil Dobbin
On 08/03/18 17:05, Bram Moolenaar wrote: > > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be included? > Or

Re: How about a release?

2018-04-18 Fir de Conversatie Bram Moolenaar
> These icons for example. Hmm, these are not IMproved. -- hundred-and-one symptoms of being an internet addict: 219. Your spouse has his or her lawyer deliver the divorce papers... via e-mail. /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor

Re: How about a release?

2018-04-18 Fir de Conversatie Ni Va
These icons for example. 2018-04-18 22:16 GMT+02:00 Bram Moolenaar : > > Christian wrote: > > > On Do, 08 Mär 2018, Bram Moolenaar wrote: > > > > > I'm thinking of creating the 8.1 release. The main new feature is the > > > terminal window, with the debugger plugin. And

Re: How about a release?

2018-04-18 Fir de Conversatie Bram Moolenaar
Christian wrote: > On Do, 08 Mär 2018, Bram Moolenaar wrote: > > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is there is something important that

Re: How about a release?

2018-04-18 Fir de Conversatie Christian Brabandt
On Do, 08 Mär 2018, Bram Moolenaar wrote: > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be included? > Or

Re: How about a release?

2018-03-19 Fir de Conversatie 'Suresh Govindachar' via vim_dev
On 3/18/2018 7:48 AM, Bram Moolenaar wrote: Justin M. Keyes wrote: I'm glad to give credits to developers who send me a patch that I can include and make Vim users happy. No matter where that code came from. Why give credit to NeoVim as a project, instead of its individual contributors? That

Re: How about a release?

2018-03-18 Fir de Conversatie Justin M. Keyes
2018-03-18 15:48 GMT+01:00 Bram Moolenaar : > > Justin M. Keyes wrote: > > I'm glad to give credits to developers who send me a patch that I can > include and make Vim users happy. No matter where that code came from. > Why give credit to NeoVim as a project, instead of its

Re: How about a release?

2018-03-18 Fir de Conversatie Bram Moolenaar
Justin M. Keyes wrote: I'm glad to give credits to developers who send me a patch that I can include and make Vim users happy. No matter where that code came from. Why give credit to NeoVim as a project, instead of its individual contributors? That would mean NeoVim helps Vim moving forward.

Re: How about a release?

2018-03-18 Fir de Conversatie Ni Va
Le dimanche 18 mars 2018 12:24:38 UTC+1, Justin M. Keyes a écrit : > 2018-03-11 16:04 GMT+01:00 Bram Moolenaar : > > > > Justin M. Keyes wrote: > > > >> 2018-03-08 18:05 GMT+01:00 Bram Moolenaar : > >> > > >> > I'm thinking of creating the 8.1 release. The

Re: How about a release?

2018-03-18 Fir de Conversatie Ni Va
Le jeudi 8 mars 2018 18:05:36 UTC+1, Bram Moolenaar a écrit : > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be

Re: How about a release?

2018-03-18 Fir de Conversatie Justin M. Keyes
2018-03-11 16:04 GMT+01:00 Bram Moolenaar : > > Justin M. Keyes wrote: > >> 2018-03-08 18:05 GMT+01:00 Bram Moolenaar : >> > >> > I'm thinking of creating the 8.1 release. The main new feature is the >> > terminal window, with the debugger plugin. And lots

Re: How about a release?

2018-03-16 Fir de Conversatie Bram Moolenaar
Christian wrote: > On Do, 08 Mär 2018, Bram Moolenaar wrote: > > > > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is there is something important that

Re: How about a release?

2018-03-16 Fir de Conversatie Bram Moolenaar
Christian wrote: > On Fr, 16 Mär 2018, Bram Moolenaar wrote: > > > Hmm, that is about updating the documentation. Does that mean they also > > implemented new-ui ? > > Yes: > https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=60eb5395fa7a7b8e3cd1841e38b6d1a0c Right, that

Re: How about a release?

2018-03-16 Fir de Conversatie Christian Brabandt
On Fr, 16 Mär 2018, Bram Moolenaar wrote: > Hmm, that is about updating the documentation. Does that mean they also > implemented new-ui ? Yes: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=60eb5395fa7a7b8e3cd1841e38b6d1a0c Best, Christian -- Liebe ist Anregung für das

Re: How about a release?

2018-03-16 Fir de Conversatie Christian Brabandt
On Do, 08 Mär 2018, Bram Moolenaar wrote: > > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be included? > Or

Re: How about a release?

2018-03-16 Fir de Conversatie Bram Moolenaar
Christian wrote: > > > On Do, 15 Mär 2018, Christian Brabandt wrote: > > > > On Do, 15 Mär 2018, M Kelly wrote: > > > > > GNU gdb (Ubuntu 7.11.1-0ubuntu1~16.5) 7.11.1 > > > > This needs a gdb 7.12 > > > > > > How about the following patch: > > > > I'm actually not sure if 7.12 is really the

Re: How about a release?

2018-03-15 Fir de Conversatie Christian Brabandt
On Do, 15 Mär 2018, Bram Moolenaar wrote: > > Christian wrote: > > > > On Do, 15 Mär 2018, Christian Brabandt wrote: > > > On Do, 15 Mär 2018, M Kelly wrote: > > > > GNU gdb (Ubuntu 7.11.1-0ubuntu1~16.5) 7.11.1 > > > This needs a gdb 7.12 > > > > How about the following patch: > > I'm

Re: How about a release?

2018-03-15 Fir de Conversatie Bram Moolenaar
Christian wrote: > On Do, 15 Mär 2018, Christian Brabandt wrote: > > On Do, 15 Mär 2018, M Kelly wrote: > > > GNU gdb (Ubuntu 7.11.1-0ubuntu1~16.5) 7.11.1 > > This needs a gdb 7.12 > > How about the following patch: I'm actually not sure if 7.12 is really the required version. It appears

Re: How about a release?

2018-03-15 Fir de Conversatie Christian Brabandt
On Do, 15 Mär 2018, Christian Brabandt wrote: > On Do, 15 Mär 2018, M Kelly wrote: > > GNU gdb (Ubuntu 7.11.1-0ubuntu1~16.5) 7.11.1 > This needs a gdb 7.12 How about the following patch: diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim

Re: How about a release?

2018-03-15 Fir de Conversatie Christian Brabandt
On Do, 15 Mär 2018, M Kelly wrote: > Error detected while processing function 17_StartDebug: > line 73: > Your gdb does not support the Machine Interface feature > > But cannot seem to find info on the web about what this means/how to make > progress. Any quick suggestion ? > Do I need to

Re: How about a release?

2018-03-15 Fir de Conversatie M Kelly
Hi, Thx. Excited to try it out, I get this - Error detected while processing function 17_StartDebug: line 73: Your gdb does not support the Machine Interface feature But cannot seem to find info on the web about what this means/how to make progress. Any quick suggestion ? Do I need to

Re: How about a release?

2018-03-14 Fir de Conversatie Christian Brabandt
On Di, 13 Mär 2018, M Kelly wrote: > Where can I learn more about the debugger plugin ? This is described briefly at :h terminal-debug Best, Christian -- Der Landarzt fährt mit 150 durchs Dorf. Seine Frau: "Nicht so schnell, Schatzi, wenn uns jetzt der Polizist sieht?" "Keine Angst, mein

Re: How about a release?

2018-03-13 Fir de Conversatie M Kelly
Hi, Where can I learn more about the debugger plugin ? thx, mark -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message

Re: How about a release?

2018-03-13 Fir de Conversatie Tony Mechelynck
On Tue, Mar 13, 2018 at 1:56 PM, Bram Moolenaar wrote: > > Tony Mechelynck wrote: > >> On Tue, Mar 13, 2018 at 3:17 AM, James McCoy wrote: >> > On Mon, Mar 12, 2018 at 11:21:55PM +0100, Christian Brabandt wrote: >> [...] >> >> Not sure, why the vartabs

Re: How about a release?

2018-03-13 Fir de Conversatie Christian Brabandt
On Di, 13 Mär 2018, Bram Moolenaar wrote: > An alternative would be to support a custom escape sequence enclosing an > arbitrary Vim command. This is tricky, since it can be abused to have > Vim execute any command when catting a file to the terminal. > We could restrict it to opening a file, a

Re: How about a release?

2018-03-13 Fir de Conversatie Christian Brabandt
On Di, 13 Mär 2018, Bram Moolenaar wrote: > I don't think code size matters much for a feature like this. > But if you want to compare sizes, you need to use a build where size is > relevant. A huge build with GUI is where users don't care about size. > The GUI adds so much that the Vim code

Re: How about a release?

2018-03-13 Fir de Conversatie Bram Moolenaar
Tony Mechelynck wrote: > On Tue, Mar 13, 2018 at 3:17 AM, James McCoy wrote: > > On Mon, Mar 12, 2018 at 11:21:55PM +0100, Christian Brabandt wrote: > [...] > >> Not sure, why the vartabs enabled Vim is actually smaller then the > >> unpatched Vim. That is certainly

Re: How about a release?

2018-03-13 Fir de Conversatie Bram Moolenaar
Nikolay Pavlov wrote: > 2018-03-13 10:13 GMT+03:00 Christian Brabandt : > > > > On Di, 13 Mär 2018, Nikolay Aleksandrovich Pavlov wrote: > > > >> Conveniently viewing tab-separated file is one thing, assembling is > >> entirely another. Who could you share such file except

Re: How about a release?

2018-03-13 Fir de Conversatie Bram Moolenaar
Skywind wrote: > One thing important for terminal: open file directly in the terminal > > Presume the shell in the vim's terminal and vim itself are always under the > different working directory. It is quite in-productive to switch to > terminal-normal mode and use vim's command to find and

Re: How about a release?

2018-03-13 Fir de Conversatie Matthew Winn
On 13/03/18 06:47, Nikolay Aleksandrovich Pavlov wrote: 2018-03-13 9:09 GMT+03:00 Matthew Winn : How many people will use it is irrelevant. The point I'm trying to make here is that all the opposition has been based around objections that have never been used to object

Re: How about a release?

2018-03-13 Fir de Conversatie Christian Brabandt
On Di, 13 Mär 2018, Nikolay Aleksandrovich Pavlov wrote: > My point is that while you can sure view those files in a nice manner > *yourself*, but it would not do any good for those who you share files > with unless they have vartabs themselves. So if files need to be > assembled it is better to

Re: How about a release?

2018-03-13 Fir de Conversatie Nikolay Aleksandrovich Pavlov
2018-03-13 10:13 GMT+03:00 Christian Brabandt : > > On Di, 13 Mär 2018, Nikolay Aleksandrovich Pavlov wrote: > >> Conveniently viewing tab-separated file is one thing, assembling is >> entirely another. Who could you share such file except person using >> (Neo)Vim with your

Re: How about a release?

2018-03-13 Fir de Conversatie Christian Brabandt
On Di, 13 Mär 2018, Nikolay Aleksandrovich Pavlov wrote: > Conveniently viewing tab-separated file is one thing, assembling is > entirely another. Who could you share such file except person using > (Neo)Vim with your patch? Spaces are safer and it is not impossible to > write a plugin which

Re: How about a release?

2018-03-13 Fir de Conversatie Christian Brabandt
On Mo, 12 Mär 2018, James McCoy wrote: > 12264088 (+vartabs) is larger than 12234272 (-vartabs). The more > interesting figures (if size is really a factor) would be after > stripping both binaries, since that's what most people are likely to > encounter. That would actually make sense and

Re: How about a release?

2018-03-13 Fir de Conversatie Nikolay Aleksandrovich Pavlov
2018-03-13 9:09 GMT+03:00 Matthew Winn : > On 12/03/18 22:06, Nikolay Aleksandrovich Pavlov wrote: >> >> 2018-03-12 0:36 GMT+03:00 Matthew Winn : >>> >>> But editing tabular information is something that a great many people do. >>> It's not just a

Re: How about a release?

2018-03-13 Fir de Conversatie Matthew Winn
On 12/03/18 22:06, Nikolay Aleksandrovich Pavlov wrote: 2018-03-12 0:36 GMT+03:00 Matthew Winn : But editing tabular information is something that a great many people do. It's not just a matter of working with tab-separated data files. How often do you want to assemble

Re: How about a release?

2018-03-12 Fir de Conversatie Nikolay Aleksandrovich Pavlov
2018-03-13 2:11 GMT+03:00 tooth pik : > nikolay: > > don't worry about other people being able to see the properly formatted > columns > > users of this feature will more than likely have 'expandtab' set I fail to see how this your suggestion is different from cleverly

Re: How about a release?

2018-03-12 Fir de Conversatie Christian J. Robinson
On Mon, 12 Mar 2018, Ben Fritz wrote: I also find myself wanting the vartabs feature any time I am working with columned format or taking notes in tabular form. I haven't bothered myself to go find and apply the patch because I need it so infrequently and for some use cases can just go open

Re: How about a release?

2018-03-12 Fir de Conversatie Ben Fritz
I also find myself wanting the vartabs feature any time I am working with columned format or taking notes in tabular form. I haven't bothered myself to go find and apply the patch because I need it so infrequently and for some use cases can just go open up a spreadsheet in a different program.

Re: How about a release?

2018-03-12 Fir de Conversatie skywind3000
>From terminal.c: * - add an optional limit for the scrollback size. When reaching it remove * 10% at the start. Could it be possible before 8.1 ?? At least I can monitor log files while editing, just like running 'tail -f' for hours in all other terminals. 在 2018年3月13日星期二

Re: How about a release?

2018-03-12 Fir de Conversatie skywind3000
One thing important for terminal: open file directly in the terminal Presume the shell in the vim's terminal and vim itself are always under the different working directory. It is quite in-productive to switch to terminal-normal mode and use vim's command to find and open a file. Emacs can

Re: How about a release?

2018-03-12 Fir de Conversatie Tony Mechelynck
On Tue, Mar 13, 2018 at 3:17 AM, James McCoy wrote: > On Mon, Mar 12, 2018 at 11:21:55PM +0100, Christian Brabandt wrote: [...] >> Not sure, why the vartabs enabled Vim is actually smaller then the >> unpatched Vim. That is certainly unexpected, I might have messed >>

Re: How about a release?

2018-03-12 Fir de Conversatie James McCoy
On Mon, Mar 12, 2018 at 11:21:55PM +0100, Christian Brabandt wrote: > With vartabs: > VIM - Vi IMproved 8.0 (2016 Sep 12, compiled Mar 12 2018 23:10:47) > Included patches: 1-1600 > Extra patches: variable tabstops > Compiled by Christian Brabandt > Huge version without GUI.

Re: How about a release?

2018-03-12 Fir de Conversatie Tony Mechelynck
On Mon, Mar 12, 2018 at 11:21 PM, Christian Brabandt wrote: > > On So, 11 Mär 2018, Tony Mechelynck wrote: > >> In order to decide whether or not it is actually "a small thing" in >> terms of executable bloat I would like to see figures: let's say the >> size of two Huge

Re: How about a release?

2018-03-12 Fir de Conversatie tooth pik
nikolay: don't worry about other people being able to see the properly formatted columns users of this feature will more than likely have 'expandtab' set On Mon, Mar 12, 2018 at 5:06 PM, Nikolay Aleksandrovich Pavlov < zyx@gmail.com> wrote: > 2018-03-12 0:36 GMT+03:00 Matthew Winn

Re: How about a release?

2018-03-12 Fir de Conversatie Christian Brabandt
On So, 11 Mär 2018, Tony Mechelynck wrote: > In order to decide whether or not it is actually "a small thing" in > terms of executable bloat I would like to see figures: let's say the > size of two Huge executables for the same OS, word size (32/64) and > GUI, differing only in inclusion or not

Re: How about a release?

2018-03-12 Fir de Conversatie Nikolay Aleksandrovich Pavlov
2018-03-12 0:36 GMT+03:00 Matthew Winn : > On 11/03/18 15:04, Bram Moolenaar wrote: >> >> First of all, I'm sorry to disappoint you. This patch has been floating >> around for a long time and has never made it in. It's not urgent, and >> not a small thing to include, with

Re: How about a release?

2018-03-11 Fir de Conversatie Tony Mechelynck
I think Matthew's argumentation is well thought out, clear and valid. I don't use variable tabs myself but I can empathize with those who do. I remember that floating-point functions were at first a crippled set, and it took some time (a year? two? more?) to convince Bram that the full set (which

Re: How about a release?

2018-03-11 Fir de Conversatie Matthew Winn
On 11/03/18 15:04, Bram Moolenaar wrote: First of all, I'm sorry to disappoint you. This patch has been floating around for a long time and has never made it in. It's not urgent, and not a small thing to include, with the result I have been postponing it for a long time. But it is a small

Re: How about a release?

2018-03-11 Fir de Conversatie JohnBeckett
On March 12, 2018 at 2:04:34 AM UTC+11, Bram Moolenaar wrote: > First of all, I'm sorry to disappoint you. This patch has > been floating around for a long time and has never made it in. > It's not urgent, and not a small thing to include, with the > result I have been postponing it for a long

Re: How about a release?

2018-03-11 Fir de Conversatie Bram Moolenaar
Matthew Winn wrote: > On 09/03/18 10:36, Bram Moolenaar wrote: > > > >> would this be a bad time to ask about variable tab stops? > > > > Yes, this is the kind of patch that needs time to wrinkle out all the > > problems. > > Like other things that change how text is displayed (linebreak,

Re: How about a release?

2018-03-11 Fir de Conversatie Bram Moolenaar
Justin M. Keyes wrote: > 2018-03-08 18:05 GMT+01:00 Bram Moolenaar : > > > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is there is

Re: How about a release?

2018-03-11 Fir de Conversatie Justin M. Keyes
2018-03-08 18:05 GMT+01:00 Bram Moolenaar : > > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be

Re: How about a release?

2018-03-11 Fir de Conversatie Marius Gedminas
On Fri, Mar 09, 2018 at 08:36:03AM -0500, David Fishburn wrote: > On Thu, Mar 8, 2018 at 5:16 PM, Christian Brabandt <[1]cbli...@256bit.org> > wrote: > > Oh and I think perhaps including the background make plugin would make > sense for a new release. > > I have been using Dispatch.vim

Re: How about a release?

2018-03-10 Fir de Conversatie Matthew Winn
On 09/03/18 10:36, Bram Moolenaar wrote: would this be a bad time to ask about variable tab stops? Yes, this is the kind of patch that needs time to wrinkle out all the problems. Like other things that change how text is displayed (linebreak, conceal). Also, I anticipate Vim becoming slower.

Re: How about a release?

2018-03-09 Fir de Conversatie Yegappan Lakshmanan
Hi Dave, On Fri, Mar 9, 2018 at 8:02 AM, David Fishburn wrote: >> > >> Oh and I think perhaps including the background make plugin would >> > >> make >> > >> sense for a new release. >> > >> >> > > I have been using Dispatch.vim (Tim Pope) for this: >> > >

Re: How about a release?

2018-03-09 Fir de Conversatie David Fishburn
> > > >> Oh and I think perhaps including the background make plugin would make > > >> sense for a new release. > > >> > > > I have been using Dispatch.vim (Tim Pope) for this: > > > https://www.vim.org/scripts/script.php?script_id=4504 > > > > > > Is the make plugin different from this? > > > > >

Re: How about a release?

2018-03-09 Fir de Conversatie Bram Moolenaar
Yegappan wrote: > On Fri, Mar 9, 2018 at 5:36 AM, David Fishburn > wrote: > > > > > > On Thu, Mar 8, 2018 at 5:16 PM, Christian Brabandt > > wrote: > >> > >> Oh and I think perhaps including the background make plugin would make > >> sense for a

Re: How about a release?

2018-03-09 Fir de Conversatie Yegappan Lakshmanan
Hi Dave, On Fri, Mar 9, 2018 at 5:36 AM, David Fishburn wrote: > > > On Thu, Mar 8, 2018 at 5:16 PM, Christian Brabandt > wrote: >> >> Oh and I think perhaps including the background make plugin would make >> sense for a new release. >> > I have been

Re: How about a release?

2018-03-09 Fir de Conversatie David Fishburn
On Thu, Mar 8, 2018 at 5:16 PM, Christian Brabandt wrote: > > Oh and I think perhaps including the background make plugin would make > sense for a new release. > > > I have been using Dispatch.vim (Tim Pope) for this: https://www.vim.org/scripts/script.php?script_id=4504 Is

Re: How about a release?

2018-03-09 Fir de Conversatie Bram Moolenaar
> would this be a bad time to ask about variable tab stops? Yes, this is the kind of patch that needs time to wrinkle out all the problems. Like other things that change how text is displayed (linebreak, conceal). Also, I anticipate Vim becoming slower. And I think the audience is actually

Re: How about a release?

2018-03-09 Fir de Conversatie Bram Moolenaar
Jason Felice wrote: > wrt the interface, I've written a small plugin that starts a terminal > window with a program that runs my builds and prints their statuses. It > doesn't have a lot of output. I'd like to be able to have normal-mode-ish > keys for the window mapped (e.g. dd deletes a

Re: How about a release?

2018-03-09 Fir de Conversatie Bram Moolenaar
Christian Brabandt wrote: > On Do, 08 Mär 2018, Bram Moolenaar wrote: > > > > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is there is something

Re: How about a release?

2018-03-08 Fir de Conversatie Christian Brabandt
On Do, 08 Mär 2018, Christian Brabandt wrote: > > On Do, 08 Mär 2018, Bram Moolenaar wrote: > > > > > I'm thinking of creating the 8.1 release. The main new feature is the > > terminal window, with the debugger plugin. And lots of smaller > > additions and plenty of bug fixes. > > > > Is

Re: How about a release?

2018-03-08 Fir de Conversatie Jason Felice
wrt the interface, I've written a small plugin that starts a terminal window with a program that runs my builds and prints their statuses. It doesn't have a lot of output. I'd like to be able to have normal-mode-ish keys for the window mapped (e.g. dd deletes a build result and makes it rerun,

Re: How about a release?

2018-03-08 Fir de Conversatie Christian Brabandt
On Do, 08 Mär 2018, Bram Moolenaar wrote: > > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and plenty of bug fixes. > > Is there is something important that should still be included? > Or

Re: How about a release?

2018-03-08 Fir de Conversatie tooth pik
would this be a bad time to ask about variable tab stops? On Thu, Mar 8, 2018 at 11:05 AM, Bram Moolenaar wrote: > > I'm thinking of creating the 8.1 release. The main new feature is the > terminal window, with the debugger plugin. And lots of smaller > additions and