Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-8

Merge from gnus--rel--5.10, gnus--rel--5.8

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-3
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-5
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-6
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-7
   Remove RCS keywords

diff --git a/contrib/gpg-ring.el b/contrib/gpg-ring.el
index a2af54d..10adec5 100644 (file)
--- a/contrib/gpg-ring.el
+++ b/contrib/gpg-ring.el
@@ -7,8 +7,6 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-28
 
 ;; Keywords: crypto
 ;; Created: 2000-04-28
 

-;; $Id: gpg-ring.el,v 7.1 2004/01/04 21:50:49 larsi Exp $
-

 ;; This file is NOT (yet?) part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; This file is NOT (yet?) part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 70841c1..9dcb2a8 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,8 +7,6 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 

-;; $Id: gpg.el,v 7.1 2004/01/04 21:50:49 larsi Exp $
-

 ;; This file is NOT (yet?) part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; This file is NOT (yet?) part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify

diff --git a/contrib/hashcash.el b/contrib/hashcash.el
index c06d6f8..087ba0c 100644 (file)
--- a/contrib/hashcash.el
+++ b/contrib/hashcash.el
@@ -1,6 +1,5 @@
 ;;; hashcash.el --- Add hashcash payments to email
 
 ;;; hashcash.el --- Add hashcash payments to email
 

-;; $Revision: 7.1 $

 ;; Copyright (C) 2003 Free Software Foundation
 ;; Copyright (C) 1997--2002 Paul E. Foley
 
 ;; Copyright (C) 2003 Free Software Foundation
 ;; Copyright (C) 1997--2002 Paul E. Foley
 

diff --git a/contrib/nnir.el b/contrib/nnir.el
index 49ab871..331662d 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -298,9 +298,6 @@
 
 ;;; Setup Code:
 
 
 ;;; Setup Code:
 

-(defconst nnir-version "$Id: nnir.el,v 7.4 2004/04/05 14:20:07 rsteib Exp $"
-  "Version of NNIR.")
-

 (require 'cl)
 (require 'nnoo)
 (require 'gnus-group)
 (require 'cl)
 (require 'nnoo)
 (require 'gnus-group)

diff --git a/contrib/ssl.el b/contrib/ssl.el
index 1d087c6..47da047 100644 (file)
--- a/contrib/ssl.el
+++ b/contrib/ssl.el
@@ -1,7 +1,4 @@
 ;;; ssl.el --- ssl functions for emacsen without them builtin
 ;;; ssl.el --- ssl functions for emacsen without them builtin

-;; Author: $Author: larsi $
-;; Created: $Date: 2004/01/04 21:50:49 $
-;; Version: $Revision: 7.1 $

 ;; Keywords: comm
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Keywords: comm
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/contrib/vcard.el b/contrib/vcard.el
index fcb33f0..39d6285 100644 (file)
--- a/contrib/vcard.el
+++ b/contrib/vcard.el
@@ -7,8 +7,6 @@
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 
 ;; Keywords: extensions
 ;; Created: 1997-09-27
 

-;; $Id: vcard.el,v 7.1 2004/01/04 21:50:49 larsi Exp $
-

 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)

diff --git a/mkinstalldirs b/mkinstalldirs
index 5251987..149a038 100755 (executable)
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,8 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
 # Created: 1993-05-16
 # Public domain
 

-# $Id: mkinstalldirs,v 7.1 2004/01/04 21:50:48 larsi Exp $
-

 errstatus=0
 
 for file
 errstatus=0
 
 for file