Re: [Quilt-dev] [PATCH 3/4] quilt.el: Load /etc/quilt.quiltrc if ~/.quiltrc doesn't exist

[Jean Delvare]

On Sat, 30 May 2020 18:00:42 +0200, Ondřej Lysoněk wrote:
> Jean Delvare <jdelvare@suse.de> writes:
> 
> > On Thu, 2020-05-14 at 21:59 +0200, Ondřej Lysoněk wrote:  
> >> quilt loads /etc/quilt.quiltrc if ~/.quiltrc doesn't exist. Do the
> >> same in quilt.el.
> >> 
> >> Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
> >> ---
> >>  lib/quilt.el | 6 +++++-
> >>  1 file changed, 5 insertions(+), 1 deletion(-)
> >> 
> >> diff --git a/lib/quilt.el b/lib/quilt.el
> >> index 66fb41a..a872aab 100644
> >> --- a/lib/quilt.el
> >> +++ b/lib/quilt.el
> >> @@ -33,7 +33,11 @@
> >>    "Return the value of a configuration variable. Return nil if it is 
> >> unset."
> >>    (or (with-current-buffer (generate-new-buffer " *cmd")
> >>          (shell-command
> >> -         (concat "test -f ~/.quiltrc && . ~/.quiltrc ;"
> >> +         (concat "if [ -f ~/.quiltrc ]; then"
> >> +           "  . ~/.quiltrc ;"
> >> +           "elif [ -f /etc/quilt.quiltrc ]; then"
> >> +           "  . /etc/quilt.quiltrc ;"
> >> +           "fi ;"
> >>                   "echo -n $" var)
> >>           t)
> >>          (unwind-protect  
> >
> > Nit-picking: alignment seems off by one char.  
> 
> Not sure where you mean exactly, but I noticed that there are tabs in the
> added lines instead of spaces, which is inconsistent with the rest of
> the function. Will fix.

Yes, that's what I meant. The mix of spaces and tabs breaks the
alignment in the patch, even if things look good in the file itself.

For your defense, the indentation is not consistent throughout the
file. But let's try to not make it worse, by being consistent within
every given function at least. Maybe we can make it fully consistent in
a separate patch, but I'm not the one making the decision of what the
proper style would be.

Thanks,
-- 
Jean Delvare
SUSE L3 Support