mutt stable branch with some hacks

Make shortpath/indent code guards explicit.

In actuality, the parent_depth and indent_width won't ever be
negative.

But the new code for unset $sidebar_relative_shortpath_indent makes
this much less obvious. Better to be explicit than have some small
future code change result in a bug.

+2 -2
+2 -2
sidebar.c
··· 750 750 } 751 751 } 752 752 753 - if (option (OPTSIDEBARSHORTPATH) && parent_depth) 753 + if (option (OPTSIDEBARSHORTPATH) && (parent_depth > 0)) 754 754 { 755 755 for (i = 0; parent_depth && sidebar_folder_name[i]; i++) 756 756 if (strchr (SidebarDelimChars, sidebar_folder_name[i])) ··· 758 758 sidebar_folder_name += i; 759 759 } 760 760 761 - if (option (OPTSIDEBARFOLDERINDENT) && indent_width) 761 + if (option (OPTSIDEBARFOLDERINDENT) && (indent_width > 0)) 762 762 { 763 763 mutt_buffer_clear (indent_folder_name); 764 764 for (i = 0; i < indent_width; i++)