I think it was both, and has become more the former now. My preferred line-width for code would be 80 characters, not including indentation for the line, with

I think it was both, and has become more the former now. My preferred line-width for code would be 80 characters, not including indentation for the line, with a maximum of 120 characters including indentation.