From: Richard Russon <rich@flatcap.org>
Date: Tue, 21 Mar 2017 03:03:18 +0000 (+0000)
Subject: tidy: comments
X-Git-Tag: neomutt-20170414~19^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4abb11fdc0ef5ca8270a52b985bc02d6181366b0;p=neomutt

tidy: comments

- drop CVS marker: $Id$
- convert // comments
- delete blank line between comment and function
---

diff --git a/README.SECURITY b/README.SECURITY
index 20d59bd82..5f90ff52e 100644
--- a/README.SECURITY
+++ b/README.SECURITY
@@ -1,5 +1,3 @@
-$Id$
-
 Recently, there have been reports on security problems induced by
 the interpretation of shell meta-characters embedded in MIME
 parameters.  These reports were referring to Pine, but the problem
diff --git a/alias.c b/alias.c
index d0186819a..7cab41356 100644
--- a/alias.c
+++ b/alias.c
@@ -166,7 +166,6 @@ void mutt_expand_aliases_env (ENVELOPE *env)
  * $ wants to be quoted since it may indicate the start of an environment
  * variable.
  */
-
 static void write_safe_address (FILE *fp, char *s)
 {
   while (*s)
@@ -401,7 +400,6 @@ retry_name:
  * Sanity-check an alias name:  Only characters which are non-special to both
  * the RFC 822 and the mutt configuration parser are permitted.
  */
-
 int mutt_check_alias_name (const char *s, char *dest, size_t destlen)
 {
   wchar_t wc;
diff --git a/attach.c b/attach.c
index 5eeb78856..183d6671f 100644
--- a/attach.c
+++ b/attach.c
@@ -903,7 +903,6 @@ int mutt_decode_save_attachment (FILE *fp, BODY *m, char *path,
  * send: BODY->filename points to the un-encoded file which contains the
  *       attachment
  */
-
 int mutt_print_attachment (FILE *fp, BODY *a)
 {
   char newfile[_POSIX_PATH_MAX] = "";
diff --git a/buffy.c b/buffy.c
index 02db2997b..757293039 100644
--- a/buffy.c
+++ b/buffy.c
@@ -55,7 +55,6 @@ static short BuffyNotify = 0;	/* # of unnotified new boxes */
 
 /* Find the last message in the file.
  * upon success return 0. If no message found - return -1 */
-
 static int fseek_last_message (FILE * f)
 {
   LOFF_T pos;
diff --git a/charset.c b/charset.c
index 2ba43817c..9aaeefa5f 100644
--- a/charset.c
+++ b/charset.c
@@ -337,7 +337,6 @@ char *mutt_get_default_charset (void)
  * applied to tocode. Highlight note: The top-well-named MUTT_ICONV_HOOK_FROM
  * acts on charset-hooks, not at all on iconv-hooks.
  */
-
 iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
 {
   char tocode1[SHORT_STRING];
@@ -376,7 +375,6 @@ iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
  * If you're supplying inrepls, the source charset should be stateless;
  * if you're supplying an outrepl, the target charset should be.
  */
-
 size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft,
 		   char **outbuf, size_t *outbytesleft,
 		   ICONV_CONST char **inrepls, const char *outrepl)
@@ -449,7 +447,6 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft,
  * Parameter flags is given as-is to mutt_iconv_open(). See there
  * for its meaning and usage policy.
  */
-
 int mutt_convert_string (char **ps, const char *from, const char *to, int flags)
 {
   iconv_t cd;
diff --git a/color.c b/color.c
index 30922514f..e21a42fc4 100644
--- a/color.c
+++ b/color.c
@@ -445,7 +445,6 @@ do_uncolor (BUFFER *buf, BUFFER *s, COLOR_LINE **ColorList,
 /* usage: uncolor index pattern [pattern...]
  * 	  unmono  index pattern [pattern...]
  */
-
 static int _mutt_parse_uncolor (BUFFER *buf, BUFFER *s, unsigned long data,
 				BUFFER *err, short parse_uncolor)
 {
@@ -762,7 +761,6 @@ static int fgbgattr_to_color(int fg, int bg, int attr)
 /* usage: color <object> <fg> <bg> [ <regexp> ]
  * 	  mono  <object> <attr> [ <regexp> ]
  */
-
 static int
 _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err,
 		   parser_callback_t callback, short dry_run)
diff --git a/commands.c b/commands.c
index 6f18c7e3d..861d5e52b 100644
--- a/commands.c
+++ b/commands.c
@@ -386,7 +386,6 @@ static void pipe_msg (HEADER *h, FILE *fp, int decode, int print)
 
 
 /* the following code is shared between printing and piping */
-
 static int _mutt_pipe_message (HEADER *h, char *cmd,
 			       int decode,
 			       int print,
diff --git a/compose.c b/compose.c
index 0f0823fac..61a08e768 100644
--- a/compose.c
+++ b/compose.c
@@ -417,7 +417,6 @@ static void update_idx (MUTTMENU *menu, ATTACHPTR **idx, short idxlen)
  * applied.
  *
  */
-
 static unsigned long cum_attachs_size (MUTTMENU *menu)
 {
   size_t s;
@@ -467,7 +466,6 @@ static void compose_status_line (char *buf, size_t buflen, size_t col, int cols,
  * This function is similar to status_format_str().  Look at that function for
  * help when modifying this function.
  */
-
 static const char *
 compose_format_str (char *buf, size_t buflen, size_t col, int cols, char op, const char *src,
 		   const char *prefix, const char *ifstring,
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index bdae6dce5..351dadcd0 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 subdir = contrib
 
 SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
diff --git a/contrib/Mush.rc b/contrib/Mush.rc
index cdbb4ded8..90ff76a5f 100644
--- a/contrib/Mush.rc
+++ b/contrib/Mush.rc
@@ -2,8 +2,6 @@
 # Key bindings similar to those of MUSH
 #
 
-# $Id$
-
 bind index . display-message
 bind index t display-message
 macro index n "<next-entry><display-message>"
diff --git a/contrib/Pine.rc b/contrib/Pine.rc
index b0deea16f..0295aee09 100644
--- a/contrib/Pine.rc
+++ b/contrib/Pine.rc
@@ -3,10 +3,6 @@
 # similar to those of PINE 3.95.
 #
 
-#
-# $Id$
-#
-
 bind index v display-message
 bind index p previous-undeleted
 bind index n next-undeleted
diff --git a/contrib/gpg.rc b/contrib/gpg.rc
index 5c4dd2727..3392038bf 100644
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -5,8 +5,6 @@
 # This version uses gpg-2comp from
 #   http://70t.de/download/gpg-2comp.tar.gz
 #
-# $Id$
-#
 # %p    The empty string when no passphrase is needed,
 #       the string "PGPPASSFD=0" if one is needed.
 #
diff --git a/contrib/language.txt b/contrib/language.txt
index e6aee7bcc..e7ce67b8a 100644
--- a/contrib/language.txt
+++ b/contrib/language.txt
@@ -1,7 +1,5 @@
 # Translation file for PGP 2.6.3(i)n.
 
-# $Id$
-
 # ------------------------------------------------------------------
 # Character set:  ISO-Latin/1 (ISO 8859/1)
 # Date revised:   7 October 1997
diff --git a/contrib/language50.txt b/contrib/language50.txt
index 614833bb3..50376bfc2 100644
--- a/contrib/language50.txt
+++ b/contrib/language50.txt
@@ -1,7 +1,5 @@
 #This file contains the strings used by PGP.
 
-# $Id$
-
 [DIFFERENT_EXES]
 us=\
 PGP is now invoked from different executables for different operations:\n\n\
diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc
index bd66cf10e..bd01e2d20 100644
--- a/contrib/pgp2.rc
+++ b/contrib/pgp2.rc
@@ -2,8 +2,6 @@
 #
 # PGP command formats for PGP 2.
 #
-# $Id$
-#
 
 #
 # Note: In order to be able to read your own messages, you'll have
diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
index 627e57979..4440d6b77 100644
--- a/contrib/pgp5.rc
+++ b/contrib/pgp5.rc
@@ -2,8 +2,6 @@
 #
 # PGP command formats for PGP 5.
 #
-# $Id$
-#
 
 # decode application/pgp
 set pgp_decode_command="%?p?PGPPASSFD=0; export PGPPASSFD;? cat %?p?-? %f | pgpv +language=mutt +verbose=0 +batchmode -f --OutputInformationFD=0"
diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc
index a317d4bec..a87080428 100644
--- a/contrib/pgp6.rc
+++ b/contrib/pgp6.rc
@@ -2,8 +2,6 @@
 #
 # PGP command formats for PGP 6.
 #
-# $Id$
-#
 
 # decode application/pgp
 set pgp_decode_command="%?p?PGPPASSFD=0; export PGPPASSFD;? cat %?p?-? %f | pgp6 +compatible   +verbose=0 +batchmode -f"
diff --git a/contrib/sample.mailcap b/contrib/sample.mailcap
index 90df26631..5d4c4f852 100644
--- a/contrib/sample.mailcap
+++ b/contrib/sample.mailcap
@@ -1,5 +1,3 @@
-# $Id$
-
 text/html; netscape -remote openURL\(%s\)
 image/gif; xv %s
 image/jpg; xv %s
diff --git a/contrib/sample.muttrc b/contrib/sample.muttrc
index 34e00cb9f..0a8f2f849 100644
--- a/contrib/sample.muttrc
+++ b/contrib/sample.muttrc
@@ -1,5 +1,3 @@
-# $Id$
-
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
 # ME's personal .muttrc (Mutt 0.92.5)
diff --git a/copy.c b/copy.c
index 4b4ccdc05..8b74c3a8c 100644
--- a/copy.c
+++ b/copy.c
@@ -348,7 +348,6 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
    prefix
    	string to use if CH_PREFIX is set
  */
-
 int
 mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
 {
@@ -519,7 +518,6 @@ static int count_delete_lines (FILE *fp, BODY *b, LOFF_T *length, size_t datelen
  *	MUTT_CM_CHARCONV	perform character set conversion
  * chflags	flags to mutt_copy_header()
  */
-
 int
 _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
 		    int flags, int chflags)
@@ -752,7 +750,6 @@ mutt_copy_message (FILE *fpout, CONTEXT *src, HEADER *hdr, int flags,
  * flags	mutt_copy_message() flags
  * chflags	mutt_copy_header() flags
  */
-
 static int
 _mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr,
 		      BODY *body, int flags, int chflags)
@@ -855,7 +852,6 @@ static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date)
  *
  * XXX - fix that.
  */
-
 static void format_address_header (char **h, ADDRESS *a)
 {
   char buf[HUGE_STRING];
diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index d876be828..8953091d8 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -2164,7 +2164,6 @@ static int line_compare(const char *a, size_t n, const char *b)
 /*
  * Implementation of `pgp_check_traditional'.
  */
-
 static int pgp_check_traditional_one_body (FILE *fp, BODY *b, int tagged_only)
 {
   char tempfile[_POSIX_PATH_MAX];
@@ -2289,7 +2288,6 @@ void pgp_gpgme_invoke_import (const char *fname)
   (Note that we aren't worse than Outlook & Cie in this, and also
   note that we can successfully handle anything produced by any
   existing versions of mutt.)  */
-
 static void copy_clearsigned (gpgme_data_t data, STATE *s, char *charset)
 {
   char buf[HUGE_STRING];
@@ -2756,7 +2754,6 @@ int smime_gpgme_application_handler (BODY *a, STATE *s)
  * %p           protocol
  * %[...] date of key using strftime(3)
  */
-
 static const char *crypt_entry_fmt (char *dest,
                                     size_t destlen,
 				    size_t col,
diff --git a/crypt.c b/crypt.c
index a615bb529..19f819247 100644
--- a/crypt.c
+++ b/crypt.c
@@ -859,7 +859,6 @@ int crypt_get_keys (HEADER *msg, char **keylist, int oppenc_mode)
  * Check if all recipients keys can be automatically determined.
  * Enable encryption if they can, otherwise disable encryption.
  */
-
 void crypt_opportunistic_encrypt(HEADER *msg)
 {
   char *pgpkeylist = NULL;
@@ -907,7 +906,6 @@ static void crypt_fetch_signatures (BODY ***signatures, BODY *a, int *n)
 /*
  * This routine verifies a  "multipart/signed"  body.
  */
-
 int mutt_signed_handler (BODY *a, STATE *s)
 {
   char tempfile[_POSIX_PATH_MAX];
@@ -1118,7 +1116,6 @@ const char* crypt_get_fingerprint_or_id (char *p, const char **pphint,
  * Used by pgp_find_keys and find_keys to check if a crypt-hook
  * value is a key id.
  */
-
 short crypt_is_numerical_keyid (const char *s)
 {
   /* or should we require the "0x"? */
diff --git a/curs_lib.c b/curs_lib.c
index f888d77b6..21efe7a5f 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -977,7 +977,6 @@ int mutt_multi_choice (char *prompt, char *letters)
 /*
  * addwch would be provided by an up-to-date curses library
  */
-
 int mutt_addwch (wchar_t wc)
 {
   char buf[MB_LEN_MAX*2];
@@ -999,7 +998,6 @@ int mutt_addwch (wchar_t wc)
  * except that the widths refer to the number of character cells
  * when printed.
  */
-
 void mutt_format_string (char *dest, size_t destlen,
 			 int min_width, int max_width,
 			 int justify, char m_pad_char,
@@ -1105,7 +1103,6 @@ void mutt_format_string (char *dest, size_t destlen,
  * except that the numbers in the conversion specification refer to
  * the number of character cells when printed.
  */
-
 static void format_s_x (char *dest,
 			     size_t destlen,
 			     const char *prefix,
@@ -1154,7 +1151,6 @@ void mutt_format_s_tree (char *dest,
  * mutt_paddstr (n, s) is almost equivalent to
  * mutt_format_string (bigbuf, big, n, n, FMT_LEFT, ' ', s, big, 0), addstr (bigbuf)
  */
-
 void mutt_paddstr (int n, const char *s)
 {
   wchar_t wc;
@@ -1263,7 +1259,6 @@ int mutt_charlen (const char *s, int *width)
  * mutt_strwidth is like mutt_strlen except that it returns the width
  * referring to the number of character cells.
  */
-
 int mutt_strwidth (const char *s)
 {
   wchar_t wc;
diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt
index e152eb1d8..02762497b 100644
--- a/doc/PGP-Notes.txt
+++ b/doc/PGP-Notes.txt
@@ -1,5 +1,3 @@
-$Id$
-
 		     USING PGP FROM WITHIN MUTT
 
 
diff --git a/doc/applying-patches.txt b/doc/applying-patches.txt
index e29428c4c..ea228a017 100644
--- a/doc/applying-patches.txt
+++ b/doc/applying-patches.txt
@@ -22,4 +22,3 @@ after applying patches may help:
 After doing so, simply type "make"; the dependencies should take
 care of the necessary other re-building (this may quite well include
 a re-running of ./configure).
-$Id$
diff --git a/editmsg.c b/editmsg.c
index c2331cb32..47959616e 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -40,7 +40,6 @@
  * 0	message edited successfully
  * -1   error
  */
-
 static int edit_one_message (CONTEXT *ctx, HEADER *cur)
 {
   char tmp[_POSIX_PATH_MAX];
diff --git a/enter.c b/enter.c
index 861d48621..69907a5a4 100644
--- a/enter.c
+++ b/enter.c
@@ -159,7 +159,6 @@ static size_t my_mbstowcs (wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *bu
 /*
  * Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF.
  */
-
 static void replace_part (ENTER_STATE *state, size_t from, char *buf)
 {
   /* Save the suffix */
@@ -207,7 +206,6 @@ static inline int is_shell_char(wchar_t ch)
  *	0 if input was given
  * 	-1 if abort.
  */
-
 int  mutt_enter_string(char *buf, size_t buflen, int col, int flags)
 {
   int rv;
diff --git a/from.c b/from.c
index 73026a942..bdc089722 100644
--- a/from.c
+++ b/from.c
@@ -58,7 +58,6 @@ static int is_day_name (const char *s)
  *
  * From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
  */
-
 int is_from (const char *s, char *path, size_t pathlen, time_t *tp)
 {
   struct tm tm;
diff --git a/gen_defs b/gen_defs
index 839d64633..a8367c8a8 100755
--- a/gen_defs
+++ b/gen_defs
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
 echo '/* Automatically generated by gen_defs.  Do not edit! */'
 echo ''
 
diff --git a/handler.c b/handler.c
index ea3051e02..00cc19b55 100644
--- a/handler.c
+++ b/handler.c
@@ -246,7 +246,6 @@ static void qp_decode_line (char *dest, char *src, size_t *l,
  * above, we just use STRING*2 for the target buffer's size.
  *
  */
-
 static void decode_quoted (STATE *s, long len, int istext, iconv_t cd)
 {
   char line[STRING];
diff --git a/hdrline.c b/hdrline.c
index 08876b8d4..0f30bd6bd 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -455,7 +455,6 @@ static char *apply_subject_mods (ENVELOPE *env)
  * %y = `x-label:' field (if present)
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
-
 static const char *
 hdr_format_str (char *dest,
 		size_t destlen,
diff --git a/imap/command.c b/imap/command.c
index c0e090089..146803865 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -931,7 +931,7 @@ int imap_exec (IMAP_DATA* idata, const char* cmdstr, int flags)
   if (flags & IMAP_CMD_QUEUE)
     return 0;
 
-  // Allow interruptions, particularly useful if there are network problems.
+  /* Allow interruptions, particularly useful if there are network problems. */
   mutt_allow_interrupt (1);
   do
     rc = imap_cmd_step (idata);
diff --git a/imap/util.c b/imap/util.c
index d9e5938d6..c0dd71762 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -776,7 +776,6 @@ void imap_unquote_string (char *s)
 /*
  * Quoting and UTF-7 conversion
  */
-
 void imap_munge_mbox_name (IMAP_DATA *idata, char *dest, size_t dlen, const char *src)
 {
   char *buf;
@@ -903,7 +902,6 @@ int imap_wait_keepalive (pid_t pid)
 }
 
 /* Allow/disallow re-opening a folder upon expunge. */
-
 void imap_allow_reopen (CONTEXT *ctx)
 {
   IMAP_DATA *idata;
diff --git a/init.c b/init.c
index 551d91898..7a575b7d8 100644
--- a/init.c
+++ b/init.c
@@ -2828,9 +2828,9 @@ static int to_absolute_path(char *path, const char *reference)
   }
 
   ref_tmp = safe_strdup(reference);
-  dirpath = dirname(ref_tmp); // get directory name of
+  dirpath = dirname(ref_tmp); /* get directory name of */
   strncpy(abs_path, dirpath, PATH_MAX);
-  safe_strncat(abs_path, sizeof(abs_path), "/", 1); // append a / at the end of the path
+  safe_strncat(abs_path, sizeof(abs_path), "/", 1); /* append a / at the end of the path */
 
   FREE(&ref_tmp);
   path_len = PATH_MAX - strlen(path);
diff --git a/lib.c b/lib.c
index 451c6707e..ed3d1529d 100644
--- a/lib.c
+++ b/lib.c
@@ -459,7 +459,6 @@ int safe_symlink(const char *oldpath, const char *newpath)
  *
  * Warning: We don't check whether src and target are equal.
  */
-
 int safe_rename (const char *src, const char *target)
 {
   struct stat ssb, tsb;
@@ -561,7 +560,6 @@ int safe_rename (const char *src, const char *target)
 
 
 /* Create a temporary directory next to a file name */
-
 static int mkwrapdir (const char *path, char *newfile, size_t nflen,
 		    char *newdir, size_t ndlen)
 {
@@ -848,7 +846,6 @@ char *mutt_substrdup (const char *begin, const char *end)
 /* prepare a file name to survive the shell's quoting rules.
  * From the Unix programming FAQ by way of Liviu.
  */
-
 size_t mutt_quote_filename (char *d, size_t l, const char *f)
 {
   size_t i, j = 0;
diff --git a/lib.h b/lib.h
index c4ace0cc1..3c360296c 100644
--- a/lib.h
+++ b/lib.h
@@ -102,7 +102,6 @@
 
 /* skip over WSP as defined by RFC5322.  This is used primarily for parsing
  * header fields. */
-
 static inline char *skip_email_wsp(const char *s)
 {
   if (s)
diff --git a/main.c b/main.c
index 09c289f44..6c991bcbf 100644
--- a/main.c
+++ b/main.c
@@ -277,7 +277,7 @@ int main (int argc, char **argv, char **environ)
 	break;
 
       case 'F':
-        // mutt_str_replace (&Muttrc, optarg);
+        /* mutt_str_replace (&Muttrc, optarg); */
         Muttrc = mutt_add_list (Muttrc, optarg);
 	break;
 
diff --git a/mbyte.c b/mbyte.c
index e39c217dd..37f8bd3fb 100644
--- a/mbyte.c
+++ b/mbyte.c
@@ -187,7 +187,6 @@ static size_t utf8rtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps)
  *     via UTF-8 using iconv.
  * Unfortunately, we can't handle non-stateless encodings.
  */
-
 static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd)
 {
   char buf[MB_LEN_MAX+1];
diff --git a/md5.c b/md5.c
index e6018a5b1..6db15fadf 100644
--- a/md5.c
+++ b/md5.c
@@ -292,7 +292,6 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
 
 /* Process LEN bytes of BUFFER, accumulating context into CTX.
    It is assumed that LEN % 64 == 0.  */
-
 void
 md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
 {
diff --git a/mh.c b/mh.c
index 36c78c275..bb8c07ecd 100644
--- a/mh.c
+++ b/mh.c
@@ -258,7 +258,6 @@ static int mh_already_notified(BUFFY *b, int msgno)
  * digits.  Deleted message get moved to a filename with a comma before
  * it.
  */
-
 static int mh_valid_message (const char *s)
 {
   for (; *s; s++)
@@ -433,7 +432,6 @@ static void mhs_write_one_sequence (FILE * fp, struct mh_sequences *mhs,
 }
 
 /* XXX - we don't currently remove deleted messages from sequences we don't know.  Should we? */
-
 static void mh_update_sequences (CONTEXT * ctx)
 {
   FILE *ofp, *nfp;
@@ -639,7 +637,6 @@ static void mh_update_maildir (struct maildir *md, struct mh_sequences *mhs)
 }
 
 /* maildir support */
-
 static void maildir_free_entry (struct maildir **md)
 {
   if (!md || !*md)
@@ -1483,7 +1480,6 @@ static int mh_close_message (CONTEXT *ctx, MESSAGE *msg)
  * with a {cur,new} prefix.
  *
  */
-
 static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
 {
   int fd;
@@ -1569,7 +1565,6 @@ static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
  * See also maildir_open_new_message().
  *
  */
-
 static int _maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
 {
   char subdir[4];
@@ -1746,7 +1741,6 @@ static int mh_commit_message (CONTEXT * ctx, MESSAGE * msg)
  * This code is also used for attachment deletion in maildir
  * folders.
  */
-
 static int mh_rewrite_message (CONTEXT * ctx, int msgno)
 {
   HEADER *h = ctx->hdrs[msgno];
@@ -2175,7 +2169,6 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
  * happens.
  *
  */
-
 static int mh_check_mailbox (CONTEXT * ctx, int *index_hint)
 {
   char buf[_POSIX_PATH_MAX];
@@ -2399,7 +2392,6 @@ void maildir_update_flags (CONTEXT *ctx, HEADER *o, HEADER *n)
  * has moved under our feet.  Note that this code is rather expensive, but
  * then again, it's called rarely.
  */
-
 static FILE *_maildir_open_find_message (const char *folder, const char *unique,
 				  const char *subfolder, char **newname)
 {
diff --git a/mime.types b/mime.types
index 51934e9fe..c4004e4d9 100644
--- a/mime.types
+++ b/mime.types
@@ -1,5 +1,3 @@
-# $Id$
-
 #
 # sample mime.types
 #
diff --git a/mutt_idna.c b/mutt_idna.c
index 92a7ba81e..4533b5794 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -299,9 +299,7 @@ const char *mutt_addr_for_display (ADDRESS *a)
   FREE (&local_mailbox);
   return buff;
 }
-
 /* Convert an ENVELOPE structure */
-
 void mutt_env_to_local (ENVELOPE *e)
 {
   mutt_addrlist_to_local (e->return_path);
diff --git a/mutt_lua.c b/mutt_lua.c
index 952a78d75..6f8cb0e3b 100644
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -373,7 +373,7 @@ static bool _lua_init(lua_State **l)
   return true;
 }
 
-// Public API -------------------------------------------------------------------
+/* Public API ----------------------------------------------------------------*/
 
 lua_State *Lua = NULL;
 
diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 1ef3d4105..421c6683c 100644
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -509,19 +509,18 @@ static bool windowed_query_from_query(const char *query, char *buf, size_t bufsz
   int beg = NotmuchQueryWindowDuration * (NotmuchQueryWindowCurrentPosition + 1);
   int end = NotmuchQueryWindowDuration *  NotmuchQueryWindowCurrentPosition;
 
-  // if the duration is a non positive integer, disable the window
+  /* if the duration is a non positive integer, disable the window */
   if (NotmuchQueryWindowDuration <= 0)
   {
     query_window_reset();
     return false;
   }
 
-  // if the query has changed, reset the window position
+  /* if the query has changed, reset the window position */
   if (NotmuchQueryWindowCurrentSearch == NULL ||
       strcmp(query, NotmuchQueryWindowCurrentSearch) != 0)
     query_window_reset();
 
-  //
   if (!query_window_check_timebase(NotmuchQueryWindowTimebase))
   {
     mutt_message (_("Invalid nm_query_window_timebase value (valid values are: hour, day, week, month or year)."));
@@ -594,9 +593,10 @@ static char *get_query_string(struct nm_ctxdata *data, int window)
     char buf[LONG_STRING];
     mutt_str_replace(&NotmuchQueryWindowCurrentSearch, data->db_query);
 
-    // if a date part is defined, do not apply windows (to avoid the risk of
-    // having a non-intersected date frame). A good improvement would be to
-    // accept if they intersect
+    /* if a date part is defined, do not apply windows (to avoid the risk of
+     * having a non-intersected date frame). A good improvement would be to
+     * accept if they intersect
+     */
     if (!strstr(data->db_query, "date:") &&
         windowed_query_from_query(data->db_query, buf, sizeof(buf)))
       data->db_query = safe_strdup(buf);
diff --git a/muttlib.c b/muttlib.c
index 7c9cbe67c..69516a378 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -109,7 +109,6 @@ void mutt_adv_mktemp (char *s, size_t l)
 }
 
 /* create a send-mode duplicate from a receive-mode body */
-
 int mutt_copy_body (FILE *fp, BODY **tgt, BODY *src)
 {
   char tmp[_POSIX_PATH_MAX];
@@ -602,7 +601,6 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
  * Replace "&" by a capitalized version of the user's login
  * name.
  */
-
 char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
 {
   regmatch_t pat_match[1];
@@ -1924,7 +1922,6 @@ void mutt_sleep (short s)
 }
 
 /* Decrease a file's modification time by 1 second */
-
 time_t mutt_decrease_mtime (const char *f, struct stat *st)
 {
   struct utimbuf utim;
diff --git a/mx.c b/mx.c
index 0f624ff67..5729849b8 100644
--- a/mx.c
+++ b/mx.c
@@ -1082,9 +1082,7 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
 #include "mutt_notmuch.h"
 #endif
 
-
 /* update a Context structure's internal tables. */
-
 void mx_update_tables(CONTEXT *ctx, int committing)
 {
   int i, j;
@@ -1392,7 +1390,6 @@ MESSAGE *mx_open_message (CONTEXT *ctx, int msgno)
 }
 
 /* commit a message to a folder */
-
 int mx_commit_message (MESSAGE *msg, CONTEXT *ctx)
 {
   if (!ctx->mx_ops || !ctx->mx_ops->commit_msg)
diff --git a/pager.c b/pager.c
index 614736aed..a426bad8a 100644
--- a/pager.c
+++ b/pager.c
@@ -1357,7 +1357,6 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
  *	0	normal exit, line was not displayed
  *	>0	normal exit, line was displayed
  */
-
 static int
 display_line (FILE *f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
 	      int *last, int *max, int flags, struct q_class_t **QuoteList,
diff --git a/parse.c b/parse.c
index c149e169c..a06ffacfc 100644
--- a/parse.c
+++ b/parse.c
@@ -405,7 +405,6 @@ static void parse_content_disposition (const char *s, BODY *ct)
  *	digest	1 if reading subparts of a multipart/digest, 0
  *		otherwise
  */
-
 BODY *mutt_read_mime_header (FILE *fp, int digest)
 {
   BODY *p = mutt_new_body();
@@ -536,7 +535,6 @@ void mutt_parse_part (FILE *fp, BODY *b)
  *
  * NOTE: this assumes that `parent->length' has been set!
  */
-
 BODY *mutt_parse_message_rfc822 (FILE *fp, BODY *parent)
 {
   BODY *msg;
@@ -571,7 +569,6 @@ BODY *mutt_parse_message_rfc822 (FILE *fp, BODY *parent)
  *
  *	digest		1 if reading a multipart/digest, 0 otherwise
  */
-
 BODY *mutt_parse_multipart (FILE *fp, const char *boundary, LOFF_T end_off, int digest)
 {
 #ifdef SUN_ATTACHMENT
diff --git a/pgp.c b/pgp.c
index d8458b4f0..de4420bec 100644
--- a/pgp.c
+++ b/pgp.c
@@ -177,7 +177,6 @@ char *pgp_fpr_or_lkeyid(pgp_key_t k)
 
 
 /* Copy PGP output messages and look for signs of a good signature */
-
 static int pgp_copy_checksig (FILE *fpin, FILE *fpout)
 {
   int rv = -1;
@@ -267,7 +266,6 @@ static int pgp_check_decryption_okay (FILE *fpin)
  * note that we can successfully handle anything produced by any
  * existing versions of mutt.)
  */
-
 static void pgp_copy_clearsigned (FILE *fpin, STATE *s, char *charset)
 {
   char buf[HUGE_STRING];
@@ -319,7 +317,6 @@ static void pgp_copy_clearsigned (FILE *fpin, STATE *s, char *charset)
 
 
 /* Support for the Application/PGP Content Type. */
-
 int pgp_application_pgp_handler (BODY *m, STATE *s)
 {
   int could_not_decrypt = 0;
@@ -1321,7 +1318,6 @@ char *pgp_find_keys (ADDRESS *adrlist, int oppenc_mode)
 
 /* Warning: "a" is no longer freed in this routine, you need
  * to free it later.  This is necessary for $fcc_attach. */
-
 BODY *pgp_encrypt_message (BODY *a, char *keylist, int sign)
 {
   char buf[LONG_STRING];
diff --git a/pgpkey.c b/pgpkey.c
index ecf613f05..27e368844 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -704,7 +704,6 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
 }
 
 /* generate a public key attachment */
-
 BODY *pgp_make_key_attachment (char *tempf)
 {
   BODY *att;
diff --git a/recvcmd.c b/recvcmd.c
index 4d500b03c..6862fdc0d 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -32,7 +32,6 @@
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
  */
-
 static short check_msg (BODY * b, short err)
 {
   if (!mutt_is_message_type (b->type, b->subtype))
@@ -67,7 +66,6 @@ static short check_all_msg (ATTACHPTR ** idx, short idxlen,
 
 
 /* can we decode all tagged attachments? */
-
 static short check_can_decode (ATTACHPTR ** idx, short idxlen,
 			      BODY * cur)
 {
@@ -98,7 +96,6 @@ static short count_tagged (ATTACHPTR **idx, short idxlen)
 /* count the number of tagged children below a multipart or message
  * attachment.
  */
-
 static short count_tagged_children (ATTACHPTR ** idx,
 				    short idxlen, short i)
 {
@@ -119,7 +116,6 @@ static short count_tagged_children (ATTACHPTR ** idx,
  ** The bounce function, from the attachment menu
  **
  **/
-
 void mutt_attach_bounce (FILE * fp, HEADER * hdr,
 	   ATTACHPTR ** idx, short idxlen, BODY * cur)
 {
@@ -247,7 +243,6 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
  **
  **
  **/
-
 void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
 			 short idxlen, BODY * cur)
 {
@@ -274,7 +269,6 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
  **/
 
 /* try to find a common parent message for the tagged attachments. */
-
 static HEADER *find_common_parent (ATTACHPTR ** idx, short idxlen,
 				   short nattach)
 {
@@ -305,7 +299,6 @@ static HEADER *find_common_parent (ATTACHPTR ** idx, short idxlen,
  * Note: This and the calling procedure could be optimized quite a
  * bit.  For now, it's not worth the effort.
  */
-
 static int is_parent (short i, ATTACHPTR **idx, short idxlen, BODY *cur)
 {
   short level = idx[i]->level;
@@ -369,7 +362,6 @@ static void include_header (int quote, FILE * ifp,
 
 /* Attach all the body parts which can't be decoded.
  * This code is shared by forwarding and replying. */
-
 static BODY ** copy_problematic_attachments (FILE *fp,
 					     BODY **last,
 					     ATTACHPTR **idx,
@@ -395,7 +387,6 @@ static BODY ** copy_problematic_attachments (FILE *fp,
  * forward one or several MIME bodies
  * (non-message types)
  */
-
 static void attach_forward_bodies (FILE * fp, HEADER * hdr,
 				   ATTACHPTR ** idx, short idxlen,
 				   BODY * cur,
@@ -571,7 +562,6 @@ _("Can't decode all tagged attachments.  MIME-forward the others?"))) == MUTT_AB
  * while, on the attachment menu, messages are referenced through
  * the attachment index.
  */
-
 static void attach_forward_msgs (FILE * fp, HEADER * hdr,
 	       ATTACHPTR ** idx, short idxlen, BODY * cur, int flags)
 {
@@ -717,7 +707,6 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
  *
  * Note that this code is horribly similar to envelope_defaults () from send.c.
  */
-
 static int
 attach_reply_envelope_defaults (ENVELOPE *env, ATTACHPTR **idx, short idxlen,
 				HEADER *parent, int flags)
@@ -804,7 +793,6 @@ attach_reply_envelope_defaults (ENVELOPE *env, ATTACHPTR **idx, short idxlen,
 
 
 /*  This is _very_ similar to send.c's include_reply(). */
-
 static void attach_include_reply (FILE *fp, FILE *tmpfp, HEADER *cur, int flags)
 {
   int cmflags = MUTT_CM_PREFIX | MUTT_CM_DECODE | MUTT_CM_CHARCONV;
diff --git a/remailer.c b/remailer.c
index abe10b987..e25fde407 100644
--- a/remailer.c
+++ b/remailer.c
@@ -115,7 +115,6 @@ static void mix_free_remailer (REMAILER **r)
 }
 
 /* parse the type2.list as given by mixmaster -T */
-
 static REMAILER **mix_type2_list (size_t *l)
 {
   FILE *fp;
@@ -358,7 +357,6 @@ static const char *mix_format_caps (REMAILER *r)
  * %a	address
  *
  */
-
 static const char *mix_entry_fmt (char *dest,
 				  size_t destlen,
 				  size_t col,
@@ -681,7 +679,6 @@ void mix_make_chain (LIST **chainp, int *redraw)
 }
 
 /* some safety checks before piping the message to mixmaster */
-
 int mix_check_message (HEADER *msg)
 {
   const char *fqdn;
diff --git a/rfc1524.c b/rfc1524.c
index 7a2819dfb..7568edc64 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -424,7 +424,6 @@ int rfc1524_mailcap_lookup (BODY *a, char *type, rfc1524_entry *entry, int opt)
   return found;
 }
 
-
 /* This routine will create a _temporary_ filename matching the
  * name template given if this needs to be done.
  *
@@ -435,7 +434,6 @@ int rfc1524_mailcap_lookup (BODY *a, char *type, rfc1524_entry *entry, int opt)
  * Returns 0 if oldfile is fine as is.
  * Returns 1 if newfile specified
  */
-
 static void strnfcpy(char *d, char *s, size_t siz, size_t len)
 {
   if(len > siz)
diff --git a/rfc2231.c b/rfc2231.c
index 69c3eb0a0..85f9b189a 100644
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -119,7 +119,6 @@ static struct rfc2231_parameter *rfc2231_new_parameter (void)
  * Primary sorting key: attribute
  * Secondary sorting key: index
  */
-
 static void rfc2231_list_insert (struct rfc2231_parameter **list,
 				 struct rfc2231_parameter *par)
 {
@@ -152,7 +151,6 @@ static void rfc2231_free_parameter (struct rfc2231_parameter **p)
 }
 
 /* process continuation parameters */
-
 static void rfc2231_join_continuations (PARAMETER **head,
 					struct rfc2231_parameter *par)
 {
diff --git a/sendlib.c b/sendlib.c
index 032f96646..7f1e0e6b0 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -927,7 +927,6 @@ CONTENT *mutt_get_content_info (const char *fname, BODY *b)
  * The longest match is used so that we can match `ps.gz' when `gz' also
  * exists.
  */
-
 int mutt_lookup_mime_type (BODY *att, const char *path)
 {
   FILE *f;
@@ -1205,7 +1204,6 @@ void mutt_stamp_attachment(BODY *a)
 }
 
 /* Get a body's character set */
-
 char *mutt_get_body_charset (char *d, size_t dlen, BODY *b)
 {
   char *p = NULL;
diff --git a/sha1.c b/sha1.c
index 6087bb49b..407ceae46 100644
--- a/sha1.c
+++ b/sha1.c
@@ -46,7 +46,6 @@
 
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
-
 void sha1_transform(uint32_t state[5], const unsigned char buffer[64])
 {
 uint32_t a, b, c, d, e;
@@ -107,7 +106,6 @@ CHAR64LONG16* block = (const CHAR64LONG16*)buffer;
 
 
 /* sha1_init - Initialize new context */
-
 void sha1_init(SHA1_CTX* context)
 {
     /* SHA1 initialization constants */
@@ -121,7 +119,6 @@ void sha1_init(SHA1_CTX* context)
 
 
 /* Run your data through this. */
-
 void sha1_update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
 {
 uint32_t i;
@@ -146,7 +143,6 @@ uint32_t j;
 
 
 /* Add padding and return the message digest. */
-
 void sha1_final(unsigned char digest[20], SHA1_CTX* context)
 {
 unsigned i;
diff --git a/smime.c b/smime.c
index 412e6e9b4..965d14f1a 100644
--- a/smime.c
+++ b/smime.c
@@ -154,7 +154,6 @@ int smime_valid_passphrase (void)
  */
 
 /* This is almost identical to ppgp's invoking interface. */
-
 static const char *_mutt_fmt_smime_command (char *dest,
 					    size_t destlen,
 					    size_t col,
@@ -781,7 +780,6 @@ static smime_key_t *smime_ask_for_key(char *prompt, short abilities, short publi
    This sets the '*ToUse' variables for an upcoming decryption, where
    the required key is different from SmimeDefaultKey.
 */
-
 static void _smime_getkeys (char *mailbox)
 {
   smime_key_t *key = NULL;
@@ -879,7 +877,6 @@ void smime_getkeys (ENVELOPE *env)
  * If oppenc_mode is true, only keys that can be determined without
  * prompting will be used.
  */
-
 char *smime_find_keys (ADDRESS *adrlist, int oppenc_mode)
 {
   smime_key_t *key = NULL;
@@ -1200,7 +1197,6 @@ static char *smime_extract_signer_certificate (char *infile)
 
 
 /* Add a certificate and update index file (externally). */
-
 void smime_invoke_import (char *infile, char *mailbox)
 {
   char tmpfname[_POSIX_PATH_MAX], *certfile = NULL, buf[STRING];
@@ -1813,7 +1809,6 @@ int smime_verify_one (BODY *sigbdy, STATE *s, const char *tempfile)
   This handles application/pkcs7-mime which can either be a signed
   or an encrypted message.
 */
-
 static BODY *smime_handle_entity (BODY *m, STATE *s, FILE *outFile)
 {
   int len=0;