diff --git a/COMMITTERS b/COMMITTERS
index 79b7b7cea15264a48ffcd7a24520cb709e2fc95a..154e53294f720555a5dec12a272880f464a88c2b 100644
--- a/COMMITTERS
+++ b/COMMITTERS
@@ -55,7 +55,7 @@ People who have committed to Pike historically by order of appearance:
hubbe Fredrik Hubinette <hubbe@hubbe.net> 1996
per Per Hedbor <per@hedbor.org>
- mirar Pontus Hagland <mirar@mirar.org>
+ mirar Pontus Hagland <mirar+pike@mirar.org>
neotron David Hedbor <david@hedbor.org>
grubba Henrik Grubbstr�m <grubba@grubba.org>
nisse Niels M�ller <nisse@lysator.liu.se>
diff --git a/lib/modules/Calendar.pmod/FAQ b/lib/modules/Calendar.pmod/FAQ
index a7335b448404b15259678f71e04202748a095635..14b4ea5e886a4242301279c294c2ee2e60c35a3b 100644
--- a/lib/modules/Calendar.pmod/FAQ
+++ b/lib/modules/Calendar.pmod/FAQ
@@ -429,7 +429,7 @@ A: For some regions, very. For most region, not very.
research, which is a rather tedious job.
If you want to help, the check your region in the
- events/regions file and send me <mirar@mirar.org> a patch.
+ events/regions file and send me <mirar+pike@mirar.org> a patch.
Don't send me "the x region is all wrong!" mails without
telling me how it should look.
@@ -462,7 +462,7 @@ A: No it isn't. But:
Q: The regional events and nameday files are awesome. May I use
them for a project separate from Pike?
-A: Yes. But send me <mirar@mirar.org> updates!
+A: Yes. But send me <mirar+pike@mirar.org> updates!
-------------------------------------------------------------------------
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 8346be7c5a5d2c9d6672e88ac50bef8304a00b59..fdb2435e2a5b0fb6bbdfc96ed94e76bda879f064 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -38,7 +38,7 @@
//! to the timezone mailing list,
//! <a href=mailto:tz@elsie.nci.nih.gov>tz@elsie.nci.nih.gov</a>,
//! preferable with a <tt>cc</tt> to
-//! <a href=mailto:mirar@mirar.org>mirar@mirar.org</a>. /Mirar
+//! <a href=mailto:mirar+pike@mirar.org>mirar+pike@mirar.org</a>. /Mirar
//!
//! see also: TZnames
diff --git a/src/modules/Image/encodings/bmp.c b/src/modules/Image/encodings/bmp.c
index 5fc0b1c42f3f2af37ca577116e10c403afde761b..559f929d71d02f754aa72c400af31c701131c069 100644
--- a/src/modules/Image/encodings/bmp.c
+++ b/src/modules/Image/encodings/bmp.c
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: bmp.c,v 1.40 2003/03/12 09:23:37 agehall Exp $
+|| $Id: bmp.c,v 1.41 2003/09/26 10:37:23 mirar Exp $
*/
/*
@@ -25,7 +25,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: bmp.c,v 1.40 2003/03/12 09:23:37 agehall Exp $");
+RCSID("$Id: bmp.c,v 1.41 2003/09/26 10:37:23 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -880,12 +880,12 @@ void i_img_bmp__decode(INT32 args,int header_only)
Pike_error("Image.BMP.decode: advanced RLE "
"decompression (cursor movement) "
"is unimplemented (please send this "
- "image to mirar@roxen.com)\n");
+ "image to mirar+pike@mirar.org)\n");
default: /* literal run */
Pike_error("Image.BMP.decode: advanced RLE "
"decompression (literal run) "
"is unimplemented (please send this "
- "image to mirar@roxen.com)\n");
+ "image to mirar+pike@mirar.org)\n");
}
break;
default:
@@ -967,7 +967,7 @@ void i_img_bmp__decode(INT32 args,int header_only)
Pike_error("Image.BMP.decode: advanced RLE "
"decompression (cursor movement) "
"is unimplemented (please send this "
- "image to mirar@roxen.com)\n");
+ "image to mirar+pike@mirar.org)\n");
#ifdef RLE_DEBUG
if (j<2) break;
fprintf(stderr,"cursor "
@@ -980,7 +980,7 @@ void i_img_bmp__decode(INT32 args,int header_only)
Pike_error("Image.BMP.decode: advanced RLE "
"decompression (non-rle data) "
"is unimplemented (please send this "
- "image to mirar@roxen.com)\n");
+ "image to mirar+pike@mirar.org)\n");
#ifdef RLE_DEBUG
fprintf(stderr,"data %5d %02x %02x [ ",
j,s[0],s[1]);
diff --git a/src/modules/Image/encodings/xwd.c b/src/modules/Image/encodings/xwd.c
index 28fb78145c774dd4b4c832eedb6c7e516e0a5653..6e04e45897736d3bad0930ba7866033f5221a742 100644
--- a/src/modules/Image/encodings/xwd.c
+++ b/src/modules/Image/encodings/xwd.c
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: xwd.c,v 1.24 2002/10/21 17:06:15 marcus Exp $
+|| $Id: xwd.c,v 1.25 2003/09/26 10:37:23 mirar Exp $
*/
/*
@@ -28,7 +28,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: xwd.c,v 1.24 2002/10/21 17:06:15 marcus Exp $");
+RCSID("$Id: xwd.c,v 1.25 2003/09/26 10:37:23 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -64,7 +64,7 @@ void image_x_decode_pseudocolor(INT32 args);
**! PseudoColor / ZPixmap
**!
**! If someone sends me files of other formats, these formats
-**! may be implemented. <tt>:)</tt> /<tt>mirar@roxen.com</tt>
+**! may be implemented. <tt>:)</tt> /<tt>mirar+pike@mirar.org</tt>
**!
**! see also: decode
**!