[no subject]

=====================================================
I like a new feature of specially displayed tabs
and trailing spaces, but sometimes they are getting
in the way. For example, when I want to cut-and-paste
with the mouse, I usually do not want it.

Also, inevitably there will be users which actively
dislike this feature. It's better for the project
if it supports those users too.

The most comprehensive solution would be two-fold:

Add a config option for it in F9->Options->General
(takes care of those users who hate whitespace
highlighting and want it off by default), and

Add a menu item to F9->Edit to toggle whitespace
highlighting temporarily with a key combination.
=====================================================

I discovered that this is already conditionalzed in the code,
just not tweakable by config dialog.

6.patch fixes it, and also it makes _trailing_ tabs
to show up as tabs if visible_tabs = 0 but visible_tws = 1.

Please apply.

7.patch is follow-up whitespace and formatting cleanup,
no code changes. Apply it if it looks ok to you.
It does not relate to the fix per se, just catering to my
perfectionist itch.

Signed-off-by: Denys Vlasenko <vda linux googlemail com>
--
vda

--001636c5b6da84d2ff046da4f3b2
Content-Type: text/x-patch; charset=US-ASCII; name="6.patch"
Content-Disposition: attachment; filename="6.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fwm2z1kj0

ZGlmZiAtZCAtdXJwTiBtYy41L2VkaXQvZWRpdGRyYXcuYyBtYy42L2VkaXQvZWRpdGRyYXcuYwot
LS0gbWMuNS9lZGl0L2VkaXRkcmF3LmMJMjAwOS0wNi0yOSAxNDowNjozNS4wMDAwMDAwMDAgKzAy
MDAKKysrIG1jLjYvZWRpdC9lZGl0ZHJhdy5jCTIwMDktMDctMDEgMTU6MjE6NTMuMDAwMDAwMDAw
ICswMjAwCkBAIC00NDIsNyArNDQyLDcgQEAgZWRpdF9kcmF3X3RoaXNfbGluZSAoV0VkaXQgKmVk
aXQsIGxvbmcgYgogCQljYXNlICdcdCc6CiAJCSAgICBpID0gVEFCX1NJWkUgLSAoKGludCkgY29s
ICUgVEFCX1NJWkUpOwogCQkgICAgY29sICs9IGk7Ci0JCSAgICBpZiAodXNlX2NvbG9ycyAmJiB2
aXNpYmxlX3RhYnMpIHsKKwkJICAgIGlmICh1c2VfY29sb3JzICYmICh2aXNpYmxlX3RhYnMgfHwg
KHZpc2libGVfdHdzICYmIHEgPj0gdHdzKSkpIHsKIAkJCWlmIChwLT5zdHlsZSAmIE1PRF9NQVJL
RUQpCiAJCQkgICAgYyA9IChwLT5zdHlsZSk7CiAJCQllbHNlCmRpZmYgLWQgLXVycE4gbWMuNS9l
ZGl0L2VkaXRvcHRpb25zLmMgbWMuNi9lZGl0L2VkaXRvcHRpb25zLmMKLS0tIG1jLjUvZWRpdC9l
ZGl0b3B0aW9ucy5jCTIwMDktMDYtMjkgMTQ6MDY6MzUuMDAwMDAwMDAwICswMjAwCisrKyBtYy42
L2VkaXQvZWRpdG9wdGlvbnMuYwkyMDA5LTA3LTAxIDE1OjIxOjUzLjAwMDAwMDAwMCArMDIwMApA
QCAtMzgsNyArMzgsNyBAQAogI2luY2x1ZGUgIi4uL3NyYy9kaWFsb2cuaCIJLyogQl9DQU5DRUwg
Ki8KICNpbmNsdWRlICIuLi9zcmMvd3Rvb2xzLmgiCS8qIFF1aWNrRGlhbG9nICovCiAKLSNkZWZp
bmUgT1BUX0RMR19IIDE5CisjZGVmaW5lIE9QVF9ETEdfSCAyMQogI2RlZmluZSBPUFRfRExHX1cg
NzIKIAogc3RhdGljIGNvbnN0IGNoYXIgKmtleV9lbXVfc3RyW10gPQpAQCAtNjcsNiArNjcsOCBA
QCBlZGl0X29wdGlvbnNfZGlhbG9nICh2b2lkKQogICAgIGludCB0b3B0aW9uX3NhdmVfcG9zaXRp
b24gPSBvcHRpb25fc2F2ZV9wb3NpdGlvbjsKICAgICBpbnQgdGVkaXRfY29uZmlybV9zYXZlID0g
ZWRpdF9jb25maXJtX3NhdmU7CiAgICAgaW50IHRlZGl0X3N5bnRheF9oaWdobGlnaHRpbmcgPSBv
cHRpb25fc3ludGF4X2hpZ2hsaWdodGluZzsKKyAgICBpbnQgdGVkaXRfdmlzaWJsZV90YWJzID0g
dmlzaWJsZV90YWJzOworICAgIGludCB0ZWRpdF92aXNpYmxlX3R3cyA9IHZpc2libGVfdHdzOwog
ICAgIGludCB0ZWRpdF9wZXJzaXN0ZW50X3NlbGVjdGlvbnMgPSBvcHRpb25fcGVyc2lzdGVudF9z
ZWxlY3Rpb25zOwogICAgIGludCB0b3B0aW9uX3JldHVybl9kb2VzX2F1dG9faW5kZW50ID0gb3B0
aW9uX3JldHVybl9kb2VzX2F1dG9faW5kZW50OwogICAgIGludCB0b3B0aW9uX2JhY2tzcGFjZV90
aHJvdWdoX3RhYnMgPSBvcHRpb25fYmFja3NwYWNlX3Rocm91Z2hfdGFiczsKQEAgLTgxLDE2ICs4
MywxNiBAQCBlZGl0X29wdGlvbnNfZGlhbG9nICh2b2lkKQogCXtxdWlja19idXR0b24sIDIsIDEw
LCBPUFRfRExHX0ggLSAzLCBPUFRfRExHX0gsIE5fKCImT0siKSwgMCwKIAkgQl9FTlRFUiwgMCwg
MCwgTlVMTCwgTlVMTCwgTlVMTH0sCiAJLyogMiAqLwotCXtxdWlja19sYWJlbCwgT1BUX0RMR19X
IC8gMiwgT1BUX0RMR19XLCBPUFRfRExHX0ggLSA3LCBPUFRfRExHX0gsCisJe3F1aWNrX2xhYmVs
LCBPUFRfRExHX1cgLyAyLCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDYsIE9QVF9ETEdfSCwKIAkg
Tl8oIldvcmQgd3JhcCBsaW5lIGxlbmd0aDogIiksIDAsIDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5V
TEx9LAogCS8qIDMgKi8KLQl7cXVpY2tfaW5wdXQsIE9QVF9ETEdfVyAvIDIgKyAyNCwgT1BUX0RM
R19XLCBPUFRfRExHX0ggLSA3LAorCXtxdWlja19pbnB1dCwgT1BUX0RMR19XIC8gMiArIDI0LCBP
UFRfRExHX1csIE9QVF9ETEdfSCAtIDYsCiAJIE9QVF9ETEdfSCwgIiIsIE9QVF9ETEdfVyAvIDIg
LSA0IC0gMjQsIDAsIDAsIDAsICJlZGl0LXdvcmQtd3JhcCIsIE5VTEwsIE5VTEx9LAogCS8qIDQg
Ki8KLQl7cXVpY2tfbGFiZWwsIE9QVF9ETEdfVyAvIDIsIE9QVF9ETEdfVywgT1BUX0RMR19IIC0g
NiwgT1BUX0RMR19ILAorCXtxdWlja19sYWJlbCwgT1BUX0RMR19XIC8gMiwgT1BUX0RMR19XLCBP
UFRfRExHX0ggLSA3LCBPUFRfRExHX0gsCiAJIE5fKCJUYWIgc3BhY2luZzogIiksIDAsIDAsIDAs
IDAsIE5VTEwsIE5VTEwsIE5VTEx9LAogCS8qIDUgKi8KLQl7cXVpY2tfaW5wdXQsIE9QVF9ETEdf
VyAvIDIgKyAyNCwgT1BUX0RMR19XLCBPUFRfRExHX0ggLSA2LAorCXtxdWlja19pbnB1dCwgT1BU
X0RMR19XIC8gMiArIDI0LCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDcsCiAJIE9QVF9ETEdfSCwg
IiIsIE9QVF9ETEdfVyAvIDIgLSA0IC0gMjQsIDAsIDAsIDAsCiAJICJlZGl0LXRhYi1zcGFjaW5n
IiwgTlVMTCwgTlVMTH0sCiAJLyogNiAqLwpAQCAtOTksMzYgKzEwMSw0MSBAQCBlZGl0X29wdGlv
bnNfZGlhbG9nICh2b2lkKQogCS8qIDcgKi8KIAl7cXVpY2tfY2hlY2tib3gsIE9QVF9ETEdfVyAv
IDIgKyAxLCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDEwLAogCSBPUFRfRExHX0gsIE5fKCJTeW50
YSZ4IGhpZ2hsaWdodGluZyIpLCA4LCAwLCAwLCAwLCBOVUxMLCBOVUxMLCBOVUxMfSwKLQkvKiA3
ICovCisJLyogOCAqLwogCXtxdWlja19jaGVja2JveCwgT1BUX0RMR19XIC8gMiArIDEsIE9QVF9E
TEdfVywgT1BUX0RMR19IIC0gMTEsCi0JIE9QVF9ETEdfSCwgTl8oIlNhdmUgZmlsZSAmcG9zaXRp
b24iKSwgMCwgMCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCisJIE9QVF9ETEdfSCwgTl8oIlZp
c2libGUgdGFicyIpLCA4LCAwLCAwLCAwLCBOVUxMLCBOVUxMLCBOVUxMfSwKIAkvKiA5ICovCiAJ
e3F1aWNrX2NoZWNrYm94LCBPUFRfRExHX1cgLyAyICsgMSwgT1BUX0RMR19XLCBPUFRfRExHX0gg
LSAxMiwKLQkgT1BUX0RMR19ILCBOXygiQ29uZmlyJm0gYmVmb3JlIHNhdmluZyIpLCA2LCAwLCAw
LCAwLCBOVUxMLCBOVUxMLCBOVUxMfSwKKwkgT1BUX0RMR19ILCBOXygiVmlzaWJsZSB0cmFpbGlu
ZyBzcGFjZXMiKSwgOCwgMCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCiAJLyogMTAgKi8KIAl7
cXVpY2tfY2hlY2tib3gsIE9QVF9ETEdfVyAvIDIgKyAxLCBPUFRfRExHX1csIE9QVF9ETEdfSCAt
IDEzLAotCSBPUFRfRExHX0gsIE5fKCJGaWxsIHRhYnMgd2l0aCAmc3BhY2VzIiksIDAsIDAsIDAs
IDAsIE5VTEwsIE5VTEwsIE5VTEx9LAorCSBPUFRfRExHX0gsIE5fKCJTYXZlIGZpbGUgJnBvc2l0
aW9uIiksIDAsIDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5VTEx9LAogCS8qIDExICovCiAJe3F1aWNr
X2NoZWNrYm94LCBPUFRfRExHX1cgLyAyICsgMSwgT1BUX0RMR19XLCBPUFRfRExHX0ggLSAxNCwK
LQkgT1BUX0RMR19ILCBOXygiJlJldHVybiBkb2VzIGF1dG9pbmRlbnQiKSwgMCwgMCwgMCwgMCwg
TlVMTCwgTlVMTCwgTlVMTH0sCisJIE9QVF9ETEdfSCwgTl8oIkNvbmZpciZtIGJlZm9yZSBzYXZp
bmciKSwgNiwgMCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCiAJLyogMTIgKi8KIAl7cXVpY2tf
Y2hlY2tib3gsIE9QVF9ETEdfVyAvIDIgKyAxLCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDE1LAot
CSBPUFRfRExHX0gsIE5fKCImQmFja3NwYWNlIHRocm91Z2ggdGFicyIpLCAwLCAwLCAwLCAwLCBO
VUxMLCBOVUxMLCBOVUxMfSwKKwkgT1BUX0RMR19ILCBOXygiRmlsbCB0YWJzIHdpdGggJnNwYWNl
cyIpLCAwLCAwLCAwLCAwLCBOVUxMLCBOVUxMLCBOVUxMfSwKIAkvKiAxMyAqLwogCXtxdWlja19j
aGVja2JveCwgT1BUX0RMR19XIC8gMiArIDEsIE9QVF9ETEdfVywgT1BUX0RMR19IIC0gMTYsCi0J
IE9QVF9ETEdfSCwgTl8oIiZGYWtlIGhhbGYgdGFicyIpLCAwLCAwLCAwLCAwLCBOVUxMLCBOVUxM
LCBOVUxMfSwKKwkgT1BUX0RMR19ILCBOXygiJlJldHVybiBkb2VzIGF1dG9pbmRlbnQiKSwgMCwg
MCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCiAJLyogMTQgKi8KLQl7cXVpY2tfcmFkaW8sIDUs
IE9QVF9ETEdfVywgT1BUX0RMR19IIC0gOSwgT1BUX0RMR19ILCAiIiwgMywgMCwgMCwKLQkgY29u
c3RfY2FzdChjaGFyICoqLCB3cmFwX3N0ciksICJ3cmFwbSIsIE5VTEwsIE5VTEx9LAorCXtxdWlj
a19jaGVja2JveCwgT1BUX0RMR19XIC8gMiArIDEsIE9QVF9ETEdfVywgT1BUX0RMR19IIC0gMTcs
CisJIE9QVF9ETEdfSCwgTl8oIiZCYWNrc3BhY2UgdGhyb3VnaCB0YWJzIiksIDAsIDAsIDAsIDAs
IE5VTEwsIE5VTEwsIE5VTEx9LAogCS8qIDE1ICovCi0Je3F1aWNrX2xhYmVsLCA0LCBPUFRfRExH
X1csIE9QVF9ETEdfSCAtIDEwLCBPUFRfRExHX0gsCi0JIE5fKCJXcmFwIG1vZGUiKSwgMCwgMCwK
LQkgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCisJe3F1aWNrX2NoZWNrYm94LCBPUFRfRExHX1cg
LyAyICsgMSwgT1BUX0RMR19XLCBPUFRfRExHX0ggLSAxOCwKKwkgT1BUX0RMR19ILCBOXygiJkZh
a2UgaGFsZiB0YWJzIiksIDAsIDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5VTEx9LAogCS8qIDE2ICov
Ci0Je3F1aWNrX3JhZGlvLCA1LCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDE1LCBPUFRfRExHX0gs
ICIiLCAzLCAwLCAwLAotCSBjb25zdF9jYXN0KGNoYXIgKiosIGtleV9lbXVfc3RyKSwgImtleWVt
dSIsIE5VTEwsIE5VTEx9LAorCXtxdWlja19yYWRpbywgNSwgT1BUX0RMR19XLCBPUFRfRExHX0gg
LSAxMSwgT1BUX0RMR19ILCAiIiwgMywgMCwgMCwKKwkgY29uc3RfY2FzdChjaGFyICoqLCB3cmFw
X3N0ciksICJ3cmFwbSIsIE5VTEwsIE5VTEx9LAogCS8qIDE3ICovCi0Je3F1aWNrX2xhYmVsLCA0
LCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDE2LCBPUFRfRExHX0gsCisJe3F1aWNrX2xhYmVsLCA0
LCBPUFRfRExHX1csIE9QVF9ETEdfSCAtIDEyLCBPUFRfRExHX0gsCisJIE5fKCJXcmFwIG1vZGUi
KSwgMCwgMCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTH0sCisJLyogMTggKi8KKwl7cXVpY2tfcmFk
aW8sIDUsIE9QVF9ETEdfVywgT1BUX0RMR19IIC0gMTcsIE9QVF9ETEdfSCwgIiIsIDMsIDAsIDAs
CisJIGNvbnN0X2Nhc3QoY2hhciAqKiwga2V5X2VtdV9zdHIpLCAia2V5ZW11IiwgTlVMTCwgTlVM
TH0sCisJLyogMTkgKi8KKwl7cXVpY2tfbGFiZWwsIDQsIE9QVF9ETEdfVywgT1BUX0RMR19IIC0g
MTgsIE9QVF9ETEdfSCwKIAkgTl8oIktleSBlbXVsYXRpb24iKSwgMCwgMCwgMCwgMCwgTlVMTCwg
TlVMTCwgTlVMTH0sCiAJTlVMTF9RdWlja1dpZGdldAogICAgIH07CkBAIC0xNTMsMTIgKzE2MCwx
NCBAQCBlZGl0X29wdGlvbnNfZGlhbG9nICh2b2lkKQogICAgIHF1aWNrX3dpZGdldHNbNV0uc3Ry
X3Jlc3VsdCA9ICZxOwogICAgIHF1aWNrX3dpZGdldHNbNl0ucmVzdWx0ID0gJnRlZGl0X3BlcnNp
c3RlbnRfc2VsZWN0aW9uczsKICAgICBxdWlja193aWRnZXRzWzddLnJlc3VsdCA9ICZ0ZWRpdF9z
eW50YXhfaGlnaGxpZ2h0aW5nOwotICAgIHF1aWNrX3dpZGdldHNbOF0ucmVzdWx0ID0gJnRvcHRp
b25fc2F2ZV9wb3NpdGlvbjsKLSAgICBxdWlja193aWRnZXRzWzldLnJlc3VsdCA9ICZ0ZWRpdF9j
b25maXJtX3NhdmU7Ci0gICAgcXVpY2tfd2lkZ2V0c1sxMF0ucmVzdWx0ID0gJnRvcHRpb25fZmls
bF90YWJzX3dpdGhfc3BhY2VzOwotICAgIHF1aWNrX3dpZGdldHNbMTFdLnJlc3VsdCA9ICZ0b3B0
aW9uX3JldHVybl9kb2VzX2F1dG9faW5kZW50OwotICAgIHF1aWNrX3dpZGdldHNbMTJdLnJlc3Vs
dCA9ICZ0b3B0aW9uX2JhY2tzcGFjZV90aHJvdWdoX3RhYnM7Ci0gICAgcXVpY2tfd2lkZ2V0c1sx
M10ucmVzdWx0ID0gJnRvcHRpb25fZmFrZV9oYWxmX3RhYnM7CisgICAgcXVpY2tfd2lkZ2V0c1s4
XS5yZXN1bHQgPSAmdGVkaXRfdmlzaWJsZV90YWJzOworICAgIHF1aWNrX3dpZGdldHNbOV0ucmVz
dWx0ID0gJnRlZGl0X3Zpc2libGVfdHdzOworICAgIHF1aWNrX3dpZGdldHNbMTBdLnJlc3VsdCA9
ICZ0b3B0aW9uX3NhdmVfcG9zaXRpb247CisgICAgcXVpY2tfd2lkZ2V0c1sxMV0ucmVzdWx0ID0g
JnRlZGl0X2NvbmZpcm1fc2F2ZTsKKyAgICBxdWlja193aWRnZXRzWzEyXS5yZXN1bHQgPSAmdG9w
dGlvbl9maWxsX3RhYnNfd2l0aF9zcGFjZXM7CisgICAgcXVpY2tfd2lkZ2V0c1sxM10ucmVzdWx0
ID0gJnRvcHRpb25fcmV0dXJuX2RvZXNfYXV0b19pbmRlbnQ7CisgICAgcXVpY2tfd2lkZ2V0c1sx
NF0ucmVzdWx0ID0gJnRvcHRpb25fYmFja3NwYWNlX3Rocm91Z2hfdGFiczsKKyAgICBxdWlja193
aWRnZXRzWzE1XS5yZXN1bHQgPSAmdG9wdGlvbl9mYWtlX2hhbGZfdGFiczsKIAogICAgIGlmIChv
cHRpb25fYXV0b19wYXJhX2Zvcm1hdHRpbmcpCiAJd3JhcF9tb2RlID0gMTsKQEAgLTE2NywxMSAr
MTc2LDExIEBAIGVkaXRfb3B0aW9uc19kaWFsb2cgKHZvaWQpCiAgICAgZWxzZQogCXdyYXBfbW9k
ZSA9IDA7CiAKLSAgICBxdWlja193aWRnZXRzWzE0XS5yZXN1bHQgPSAmd3JhcF9tb2RlOwotICAg
IHF1aWNrX3dpZGdldHNbMTRdLnZhbHVlID0gd3JhcF9tb2RlOworICAgIHF1aWNrX3dpZGdldHNb
MTZdLnJlc3VsdCA9ICZ3cmFwX21vZGU7CisgICAgcXVpY2tfd2lkZ2V0c1sxNl0udmFsdWUgPSB3
cmFwX21vZGU7CiAKLSAgICBxdWlja193aWRnZXRzWzE2XS5yZXN1bHQgPSAmdGVkaXRfa2V5X2Vt
dWxhdGlvbjsKLSAgICBxdWlja193aWRnZXRzWzE2XS52YWx1ZSA9IHRlZGl0X2tleV9lbXVsYXRp
b247CisgICAgcXVpY2tfd2lkZ2V0c1sxOF0ucmVzdWx0ID0gJnRlZGl0X2tleV9lbXVsYXRpb247
CisgICAgcXVpY2tfd2lkZ2V0c1sxOF0udmFsdWUgPSB0ZWRpdF9rZXlfZW11bGF0aW9uOwogCiAg
ICAgUXVpY2tfb3B0aW9ucy53aWRnZXRzID0gcXVpY2tfd2lkZ2V0czsKIApAQCAtMTkzLDYgKzIw
Miw4IEBAIGVkaXRfb3B0aW9uc19kaWFsb2cgKHZvaWQpCiAKICAgICBvcHRpb25fcGVyc2lzdGVu
dF9zZWxlY3Rpb25zID0gdGVkaXRfcGVyc2lzdGVudF9zZWxlY3Rpb25zOwogICAgIG9wdGlvbl9z
eW50YXhfaGlnaGxpZ2h0aW5nID0gdGVkaXRfc3ludGF4X2hpZ2hsaWdodGluZzsKKyAgICB2aXNp
YmxlX3RhYnMgPSB0ZWRpdF92aXNpYmxlX3RhYnM7CisgICAgdmlzaWJsZV90d3MgPSB0ZWRpdF92
aXNpYmxlX3R3czsKICAgICBlZGl0X2NvbmZpcm1fc2F2ZSA9IHRlZGl0X2NvbmZpcm1fc2F2ZTsK
ICAgICBvcHRpb25fc2F2ZV9wb3NpdGlvbiA9IHRvcHRpb25fc2F2ZV9wb3NpdGlvbjsKICAgICBv
cHRpb25fZmlsbF90YWJzX3dpdGhfc3BhY2VzID0gdG9wdGlvbl9maWxsX3RhYnNfd2l0aF9zcGFj
ZXM7CkBAIC0yMTksNyArMjMwLDcgQEAgZWRpdF9vcHRpb25zX2RpYWxvZyAodm9pZCkKIAogICAg
IC8qIExvYWQgb3IgdW5sb2FkIHN5bnRheCBydWxlcyBpZiB0aGUgb3B0aW9uIGhhcyBjaGFuZ2Vk
ICovCiAgICAgaWYgKG9wdGlvbl9zeW50YXhfaGlnaGxpZ2h0aW5nICE9IG9sZF9zeW50YXhfaGwp
Ci0gCWVkaXRfbG9hZF9zeW50YXggKHdlZGl0LCBOVUxMLCBvcHRpb25fc3ludGF4X3R5cGUpOwor
CWVkaXRfbG9hZF9zeW50YXggKHdlZGl0LCBOVUxMLCBvcHRpb25fc3ludGF4X3R5cGUpOwogICAg
IC8qIExvYWQgdXNlcm1hcCBpZiBpdCdzIG5lZWRlZCAqLwogICAgIGVkaXRfbG9hZF91c2VyX21h
cCAod2VkaXQpOwogfQo=
--001636c5b6da84d2ff046da4f3b2
Content-Type: text/x-patch; charset=US-ASCII; name="7.patch"
Content-Disposition: attachment; filename="7.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fwm2z5as1

ZGlmZiAtZCAtdXJwTiBtYy42L2VkaXQvZWRpdGRyYXcuYyBtYy43L2VkaXQvZWRpdGRyYXcuYwot
LS0gbWMuNi9lZGl0L2VkaXRkcmF3LmMJMjAwOS0wNy0wMSAxNToyMTo1My4wMDAwMDAwMDAgKzAy
MDAKKysrIG1jLjcvZWRpdC9lZGl0ZHJhdy5jCTIwMDktMDctMDEgMTU6MjA6NTQuMDAwMDAwMDAw
ICswMjAwCkBAIC0zMzAsMjcgKzMzMCwyNSBAQCBwcmludF90b193aWRnZXQgKFdFZGl0ICplZGl0
LCBsb25nIHJvdywgCiAjZW5kaWYKIAkJICAgIHNldF9jb2xvciAoRURJVE9SX1dISVRFU1BBQ0Vf
Q09MT1IpOwogCSAgICB9CisJfSBlbHNlIGlmIChzdHlsZSAmIE1PRF9CT0xEKSB7CisJICAgIHNl
dF9jb2xvciAoRURJVE9SX0JPTERfQ09MT1IpOworCX0gZWxzZSBpZiAoc3R5bGUgJiBNT0RfTUFS
S0VEKSB7CisJICAgIHNldF9jb2xvciAoRURJVE9SX01BUktFRF9DT0xPUik7CiAJfSBlbHNlIHsK
LQkgICAgaWYgKHN0eWxlICYgTU9EX0JPTEQpIHsKLQkJc2V0X2NvbG9yIChFRElUT1JfQk9MRF9D
T0xPUik7Ci0JICAgIH0gZWxzZSBpZiAoc3R5bGUgJiBNT0RfTUFSS0VEKSB7Ci0JCXNldF9jb2xv
ciAoRURJVE9SX01BUktFRF9DT0xPUik7CisJICAgIGxvd2xldmVsX3NldF9jb2xvciAoY29sb3Ip
OworCX0KKwlpZiAoIHRleHRjaGFyID4gMjU1ICkgeworCSAgICBpbnQgcmVzID0gZ191bmljaGFy
X3RvX3V0ZjggKHRleHRjaGFyLCAoY2hhciAqKXN0cik7CisJICAgIGlmICggcmVzID09IDAgKSB7
CisJCXN0clswXSA9ICcuJzsKKwkJc3RyWzFdID0gJ1wwJzsKIAkgICAgfSBlbHNlIHsKLQkJbG93
bGV2ZWxfc2V0X2NvbG9yIChjb2xvcik7CisJCXN0cltyZXNdID0gJ1wwJzsKIAkgICAgfQorCSAg
ICBhZGRzdHIgKChjaGFyICopc3RyKTsKKwl9IGVsc2UgeworCSAgICBhZGRjaCh0ZXh0Y2hhcik7
CiAJfQotCWlmICggdGV4dGNoYXIgPiAyNTUgKSB7Ci0gICAgICAgICAgICBpbnQgcmVzID0gZ191
bmljaGFyX3RvX3V0ZjggKHRleHRjaGFyLCAoY2hhciAqKXN0cik7Ci0gICAgICAgICAgICBpZiAo
IHJlcyA9PSAwICkgewotICAgICAgICAgICAgICAgIHN0clswXSA9ICcuJzsKLSAgICAgICAgICAg
ICAgICBzdHJbMV0gPSAnXDAnOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAg
ICBzdHJbcmVzXSA9ICdcMCc7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBhZGRzdHIgKChj
aGFyICopc3RyKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGFkZGNoKHRleHRjaGFy
KTsKLSAgICAgICAgfQogCXArKzsKICAgICB9CiB9CkBAIC0zODQsMjAgKzM4MiwyMCBAQCBlZGl0
X2RyYXdfdGhpc19saW5lIChXRWRpdCAqZWRpdCwgbG9uZyBiCiAgICAgYzIgPSBtYXggKGVkaXQt
PmNvbHVtbjEsIGVkaXQtPmNvbHVtbjIpOwogCiAgICAgaWYgKCBvcHRpb25fbGluZV9zdGF0ZSAp
IHsKLSAgICAgICAgY3VyX2xpbmUgPSBlZGl0LT5zdGFydF9saW5lICsgcm93OwotICAgICAgICBp
ZiAoIGN1cl9saW5lIDw9IGVkaXQtPnRvdGFsX2xpbmVzICkgewotICAgICAgICAgICAgZ19zbnBy
aW50ZiAobGluZV9zdGF0LCBMSU5FX1NUQVRFX1dJRFRIICsgMSwgIiU3aSAiLCBjdXJfbGluZSAr
IDEpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgbWVtc2V0KGxpbmVfc3RhdCwgJyAn
LCBMSU5FX1NUQVRFX1dJRFRIKTsKLSAgICAgICAgICAgIGxpbmVfc3RhdFtMSU5FX1NUQVRFX1dJ
RFRIXSA9ICdcMCc7Ci0gICAgICAgIH0KKwljdXJfbGluZSA9IGVkaXQtPnN0YXJ0X2xpbmUgKyBy
b3c7CisJaWYgKCBjdXJfbGluZSA8PSBlZGl0LT50b3RhbF9saW5lcyApIHsKKwkgICAgZ19zbnBy
aW50ZiAobGluZV9zdGF0LCBMSU5FX1NUQVRFX1dJRFRIICsgMSwgIiU3aSAiLCBjdXJfbGluZSAr
IDEpOworCX0gZWxzZSB7CisJICAgIG1lbXNldChsaW5lX3N0YXQsICcgJywgTElORV9TVEFURV9X
SURUSCk7CisJICAgIGxpbmVfc3RhdFtMSU5FX1NUQVRFX1dJRFRIXSA9ICdcMCc7CisJfQogICAg
IH0KIAogICAgIGlmIChjb2wgKyAxNiA+IC1lZGl0LT5zdGFydF9jb2wpIHsKIAlldmFsX21hcmtz
IChlZGl0LCAmbTEsICZtMik7CiAKIAlpZiAocm93IDw9IGVkaXQtPnRvdGFsX2xpbmVzIC0gZWRp
dC0+c3RhcnRfbGluZSkgewotCQlsb25nIHR3cyA9IDA7CisJICAgIGxvbmcgdHdzID0gMDsKIAkg
ICAgaWYgKHVzZV9jb2xvcnMgJiYgdmlzaWJsZV90d3MpIHsKIAkJdHdzID0gZWRpdF9lb2wgKGVk
aXQsIGIpOwogCQl3aGlsZSAodHdzID4gYiAmJiAoKGMgPSBlZGl0X2dldF9ieXRlIChlZGl0LCB0
d3MgLSAxKSkgPT0gJyAnCg==
--001636c5b6da84d2ff046da4f3b2--