Fix a few indenting issues.

These are mostly the result of making the formatting changes commit
after the indent changes commit.

diff --git a/attach.c b/attach.c
index 6d53b015238d770b34c449d78e1ec1a5164f2b87..9c2189d0ff555e1959a033896f9a33bfb2784e0a 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -742,10 +742,10 @@ int mutt_save_attachment (FILE *fp, BODY *m, const char *path, int flags, HEADER
     /* recv mode */
 
     if (hdr &&
-       m->hdr &&
-       m->encoding != ENCBASE64 &&
-       m->encoding != ENCQUOTEDPRINTABLE &&
-       mutt_is_message_type(m->type, m->subtype))
+        m->hdr &&
+        m->encoding != ENCBASE64 &&
+        m->encoding != ENCQUOTEDPRINTABLE &&
+        mutt_is_message_type(m->type, m->subtype))
     {
       /* message type attachments are written to mail folders. */
 

diff --git a/browser.c b/browser.c
index cf99a39fd45deae61adea851b2816baf682878f2..cb30f8295d19b82d0d77842493f5bf1de8705dbe 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -231,14 +231,14 @@ folder_format_str (char *dest, size_t destlen, size_t col, int cols, char op, co
 
       snprintf (fn, sizeof (fn), "%s%s", s,
                folder->ff->local ?
-                  (S_ISLNK (folder->ff->mode) ?
-                     "@" :
-                     (S_ISDIR (folder->ff->mode) ?
-                        "/" :
-                        ((folder->ff->mode & S_IXUSR) != 0 ?
-                           "*" :
-                           ""))) :
-                  "");
+                (S_ISLNK (folder->ff->mode) ?
+                 "@" :
+                 (S_ISDIR (folder->ff->mode) ?
+                  "/" :
+                  ((folder->ff->mode & S_IXUSR) != 0 ?
+                   "*" :
+                   ""))) :
+                "");
 
       mutt_format_s (dest, destlen, fmt, fn);
       break;

diff --git a/mime.h b/mime.h
index dd8655f3a17efff55a382c1d4fe2bc4677635e56..0a1ceca9c9e611dd0cc0383e643017ecadef91d9 100644 (file)
--- a/mime.h
+++ b/mime.h
@@ -65,8 +65,8 @@ extern const char B64Chars[];
 
 #define is_multipart(x)                                                 \
   ((x)->type == TYPEMULTIPART                                           \
-    || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \
-    || !strcasecmp((x)->subtype, "news"))))
+   || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \
+   || !strcasecmp((x)->subtype, "news"))))
 
 extern const char *BodyTypes[];
 extern const char *BodyEncodings[];

diff --git a/pager.c b/pager.c
index c0a9fba43f6c2284f63ca30cd4c47325d4a30725..fb821305d8c1a204ee05acce2a34b8e17614e8f1 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -76,7 +76,7 @@ static HEADER *OldHdr = NULL;
   }
 
 #define CHECK_ATTACH                                                    \
-  if (option(OPTATTACHMSG))                                              \
+  if (option(OPTATTACHMSG))                                             \
   {                                                                     \
     mutt_flushinp ();                                                   \
     mutt_error _(Function_not_permitted_in_attach_message_mode);        \

diff --git a/pgp.c b/pgp.c
index cfccce4cf03668df8ef0f327c5456adb13e4b059..f3b7b49533699c358d6ad418f63349d44a8c3466 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -825,8 +825,8 @@ int pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempfile)
   crypt_current_time (s, "PGP");
 
   if ((thepid = pgp_invoke_verify (NULL, &pgpout, NULL,
-                                  -1, -1, fileno(pgperr),
-                                  tempfile, sigfile)) != -1)
+                                   -1, -1, fileno(pgperr),
+                                   tempfile, sigfile)) != -1)
   {
     if (pgp_copy_checksig (pgpout, s->fpout) >= 0)
       badsig = 0;