From: <eb...@dr...> - 2011-01-27 20:44:22
|
Okay reverting patches can be found here: http://drak.ucw.cz/~ebik/git/notion see commit log below. If I will have time I will create new version of the proportional tabs code. At least more configurable and with nicer algorithm. I also re-commited one fix and one default found in the reverted patch. The remaining difference is discutable. Either it removes unnecessary code or it is a regression. The difference is below. ============ not applied fix =========== diff --git a/etc/look.lua b/etc/look.lua new file mode 100644 index 0000000..2484e42 --- /dev/null +++ b/etc/look.lua @@ -0,0 +1 @@ +dopath('look_newviolet') diff --git a/ioncore/sizepolicy.c b/ioncore/sizepolicy.c index ce77edb..8c42327 100644 --- a/ioncore/sizepolicy.c +++ b/ioncore/sizepolicy.c @@ -360,10 +360,5 @@ bool string2sizepolicy(const char *szplcy, WSizePolicy *value) const char *sizepolicy2string(WSizePolicy szplcy) { - const char* str=stringintmap_key(szplcy_specs, szplcy, NULL); - if(str==NULL){ - /* fall back on policy without modifiers if full name not found */ - str=stringintmap_key(szplcy_specs, szplcy&0xff, NULL); - } - return str; + return stringintmap_key(szplcy_specs, szplcy, NULL); } ======================================= Here is commit log of changes I made. The 'Add default style' change is also based on the reverted patches. ============= commit log ============== commit 7f09147bb8689b745dfec7aaac33eb1655d44a0d Author: Tomáš Ebenlendr <eb...@uc...> Date: Thu Jan 27 21:33:03 2011 +0100 Add default style. commit 4e896d7897131c1c10c8211d8dcf3cff3aa567d7 Author: Tomáš Ebenlendr <eb...@uc...> Date: Thu Jan 27 21:03:08 2011 +0100 Fix str_len() in the case of multibyte encoding. str_len() fix based on reverted commit 951f7ac - changes found in http://github.com/gwash/ion-3plus commit d8196fff51d4d2a14646239e211ff1cd788c9883 Author: Tomáš Ebenlendr <eb...@uc...> Date: Thu Jan 27 20:00:12 2011 +0100 Revert of 951f7acb - because of ugly code. Commit 951f7acb with name: "Merge some changes found in http://github.com/gwash/ion-3plus" contains my (eb...@uc...) patch to elastic/proportional tab sizes, which was proof of concept and was not intended to get into mainline. commit 7e3df042741bb89eb26b2a0bcf4aa7a68436045e Author: Tomáš Ebenlendr <eb...@uc...> Date: Thu Jan 27 19:52:59 2011 +0100 Reverting commit 8cabc655, to revert 951f7acb Reverting commit 8cabc655 (fix of miscalculations of tab sizes) to be able to revert commit 951f7acb, which was a blind apply of changes from http://github.com/gwash/ion3-plus without any review. Second reason is that 8cabc655 should be split in two commits. -- Tomáš 'ebík' Ebenlendr PF 2011.07367757484 |