mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 21:33:09 +00:00
Squashed commit of the following:
commit 5b7659ec3d5e67b8dad8d3543d87a0169dc9a9e9 Merge:57f3df3
22a4cd6
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Thu Jun 21 10:15:41 2012 -0700 Merge branch 'master' of https://github.com/maxfl/fish-shell into maxfl-master-base commit22a4cd686f
Author: maxfl <gmaxfl@gmail.com> Date: Tue Jun 19 15:51:43 2012 +0400 set now expands the variable size, if index is outside it commit9b0ffa8315
Author: maxfl <gmaxfl@gmail.com> Date: Mon Jun 18 21:30:44 2012 +0400 fixes #78 commit78387fb391
Merge:c0e6096
93dc7d4
Author: maxfl <gmaxfl@gmail.com> Date: Mon Jun 18 21:27:47 2012 +0400 Merge remote-tracking branch 'fishfish/master' commitc0e60963c1
Merge:32a98e7
1bead8a
Author: maxfl <gmaxfl@gmail.com> Date: Mon Jun 18 10:29:42 2012 +0400 Merge remote-tracking branch 'fishfish/master' commit32a98e799e
Merge:6e71021
f2b5292
Author: maxfl <gmaxfl@gmail.com> Date: Sat Jun 16 18:42:07 2012 +0400 Merge remote-tracking branch 'fishfish/master' commit6e710211bc
Author: maxfl <gmaxfl@gmail.com> Date: Thu Jun 14 11:01:13 2012 +0400 revert fish_pager commit731a29f35b
Author: maxfl <gmaxfl@gmail.com> Date: Thu Jun 14 10:57:41 2012 +0400 revert fish_pager.cpp commit72c1bfc7bf
Merge:ea74ffa
9b781c4
Author: maxfl <gmaxfl@gmail.com> Date: Wed Jun 13 17:54:11 2012 +0400 Merge branch 'master' into maxfl_completions commitea74ffa086
Author: maxfl <gmaxfl@gmail.com> Date: Wed Jun 13 17:35:20 2012 +0400 __fish_complete_command now can understand '--arg=option' tokens latexmk completion is updated commit45b667826f
Author: maxfl <gmaxfl@gmail.com> Date: Wed Jun 13 16:46:47 2012 +0400 . completion commit1c9f8ffc9e
Author: maxfl <gmaxfl@gmail.com> Date: Wed Jun 13 16:46:13 2012 +0400 a lot of new completions commit8224d9f984
Author: Maxim Gonchar <gonchar@myhost.localdomain> Date: Tue Jun 12 20:19:31 2012 +0400 A lot of new completions. Some small updates and fixes of old functions and completions. commit234ed8f5da
Author: Maxim Gonchar <gonchar@myhost.localdomain> Date: Tue Jun 12 20:03:44 2012 +0400 step-coloring initial set_color correction
This commit is contained in:
parent
57f3df3cab
commit
19e183f02f
2 changed files with 6 additions and 1 deletions
|
@ -264,6 +264,10 @@ static int update_values( wcstring_list_t &list,
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
if ( ind >= list.size() )
|
||||||
|
{
|
||||||
|
list.resize( ind+1 );
|
||||||
|
}
|
||||||
|
|
||||||
// free((void *) al_get(list, ind));
|
// free((void *) al_get(list, ind));
|
||||||
list[ ind ] = newv;
|
list[ ind ] = newv;
|
||||||
|
|
|
@ -280,6 +280,7 @@ void set_color(rgb_color_t c, rgb_color_t c2)
|
||||||
Background is set
|
Background is set
|
||||||
*/
|
*/
|
||||||
bg_set=1;
|
bg_set=1;
|
||||||
|
if ( c==c2 )
|
||||||
c = (c2==rgb_color_t::white())?rgb_color_t::black():rgb_color_t::white();
|
c = (c2==rgb_color_t::white())?rgb_color_t::black():rgb_color_t::white();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue