Get rid of the rcsid fields. They are getting in the way whenever Imutt-1-0-stable-mailcap

merge changes into unstable.

97 files changed, 103 insertions, 282 deletions

diff --git a/acconfig.h b/acconfig.h
index 7e3a9ec4..59b7633f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* Is this the international version? */
 #undef SUBVERSION
diff --git a/addrbook.c b/addrbook.c
index e3fd75b5..a24024b5 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/alias.c b/alias.c
index b4653e19..30f81f8f 100644
--- a/alias.c
+++ b/alias.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/attach.c b/attach.c
index a01fb762..b18b6620 100644
--- a/attach.c
+++ b/attach.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/attach.h b/attach.h
index 93eb4a44..32e9d0d5 100644
--- a/attach.h
+++ b/attach.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/browser.c b/browser.c
index 29fbe321..2420b0dd 100644
--- a/browser.c
+++ b/browser.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/buffy.c b/buffy.c
index 2ee6f6be..e28bd1f6 100644
--- a/buffy.c
+++ b/buffy.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /* 
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/buffy.h b/buffy.h
index 74ec655f..c736a86a 100644
--- a/buffy.h
+++ b/buffy.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* 
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/charset.c b/charset.c
index 40d12e5b..cc4ebb1f 100644
--- a/charset.c
+++ b/charset.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1998 Ruslan Ermilov <ru@ucb.crimea.ua>,
  *                    Thomas Roessler <roessler@guug.de>
diff --git a/charset.h b/charset.h
index fd67cf32..6120a2c6 100644
--- a/charset.h
+++ b/charset.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1998 Ruslan Ermilov <ru@ucb.crimea.ua>
  *
diff --git a/color.c b/color.c
index 7e108b73..18ad0735 100644
--- a/color.c
+++ b/color.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/commands.c b/commands.c
index b4cabad9..f2be30aa 100644
--- a/commands.c
+++ b/commands.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/complete.c b/complete.c
index e7bd5e1e..f8d708f5 100644
--- a/complete.c
+++ b/complete.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/compose.c b/compose.c
index 7766c515..ea0f5b20 100644
--- a/compose.c
+++ b/compose.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/copy.c b/copy.c
index e38b08e0..22bcc556 100644
--- a/copy.c
+++ b/copy.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/copy.h b/copy.h
index c66998fc..1732393e 100644
--- a/copy.h
+++ b/copy.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/curs_lib.c b/curs_lib.c
index 2a6a5649..6d8df4bc 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/curs_main.c b/curs_main.c
index d314e806..b3e44c01 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/date.c b/date.c
index b0a3cfa7..2fbb4e0d 100644
--- a/date.c
+++ b/date.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/dotlock.c b/dotlock.c
index e1f892b7..a9b891dd 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * Copyright (C) 1998 Thomas Roessler <roessler@guug.de>
diff --git a/dotlock.h b/dotlock.h
index 0f1ba766..4dde522c 100644
--- a/dotlock.h
+++ b/dotlock.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * Copyright (C) 1998 Thomas Roessler <roessler@guug.de>
diff --git a/edit.c b/edit.c
index b3824ff4..6b59b335 100644
--- a/edit.c
+++ b/edit.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/enter.c b/enter.c
index 301de8bf..2905a56c 100644
--- a/enter.c
+++ b/enter.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/filter.c b/filter.c
index 85dfa311..0685f69b 100644
--- a/filter.c
+++ b/filter.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins.
  * 
diff --git a/flags.c b/flags.c
index ccd5dc66..c38d9a07 100644
--- a/flags.c
+++ b/flags.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/from.c b/from.c
index 6a89a40c..35030fa6 100644
--- a/from.c
+++ b/from.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/functions.h b/functions.h
index f773b001..e2f3e4a8 100644
--- a/functions.h
+++ b/functions.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/getdomain.c b/getdomain.c
index ff77d4ec..5b2d715f 100644
--- a/getdomain.c
+++ b/getdomain.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/globals.h b/globals.h
index 0ce530e3..5ce9deed 100644
--- a/globals.h
+++ b/globals.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/gnupgparse.c b/gnupgparse.c
index 6ec96a80..306b6c87 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1998 Werner Koch <werner.koch@guug.de>
  *
diff --git a/handler.c b/handler.c
index 6f38d0b3..182f6974 100644
--- a/handler.c
+++ b/handler.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
@@ -1377,8 +1376,7 @@ void mutt_body_handler (BODY *b, STATE *s)
 
       if (!p)
         mutt_error _("Error: multipart/signed has no protocol.");
-      else if (mutt_strcasecmp ("application/pgp-signature", p) == 0 ||
-	       mutt_strcasecmp ("multipart/mixed", p) == 0)
+      else if (mutt_strcasecmp ("application/pgp-signature", p) == 0)
       {
 	if (s->flags & M_VERIFY)
 	  handler = pgp_signed_handler;
diff --git a/hash.c b/hash.c
index 3cc0ed5a..d855cb0f 100644
--- a/hash.c
+++ b/hash.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  *
diff --git a/hash.h b/hash.h
index 9a88d31b..bc079a11 100644
--- a/hash.h
+++ b/hash.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  *
diff --git a/hdrline.c b/hdrline.c
index c41c30f4..988c8401 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/headers.c b/headers.c
index eb2dd434..f1a569d2 100644
--- a/headers.c
+++ b/headers.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /* 
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/help.c b/help.c
index 9bf3df56..c099f9b3 100644
--- a/help.c
+++ b/help.c
@@ -1,4 +1,3 @@
-static const char rcsid[]="$Id$";
 /*
  * Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>
  * 
diff --git a/history.c b/history.c<