Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 226-238)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * gnus--rel--5.10  (patch 86-90)

   - Update from CVS
   - Merge from emacs--devo--0

8 files changed, 13 insertions, 6 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8256beefb6c..9dc0def4788 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com>
+
+        * ./* (Copyright): Updated Copyright year(s)
+        
 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * FOR-RELEASE (BUGS): Add URLs/MIDs.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 947922a4888..c641fbe106c 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -37,6 +37,9 @@ Assigned to Bill Wohler <wohler@newt.com>.
 
 ** Is there a basic problem with cl-byte-compile-compiler-macro?
 
+** Recalculate the tool bar height after changing the default font.
+(Bug report by Yamamoto Mistuharu, 31 Mar 2006)
+
 ** Markus Gritsch's report about Emacs looping on Windoze with the following
 .emacs file, and then reduce Emacs frame width to "something quite narrow":
         (setq-default truncate-lines t)
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 361b3bd2f24..947b542005c 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,5 +1,5 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index 083c9e766e6..29fc0f0b94c 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/cus-test.el b/admin/cus-test.el
index ff38b0b08ff..6ff92b88c95 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002, 2006 Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 7f27ab99876..da3b1911abb 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/make-emacs b/admin/make-emacs
index d17e59e5692..57d04a8f625 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/revdiff b/admin/revdiff
index d936106aada..3b5ffaad3f1 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #