Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 22-23)

   - Update from CVS

2007-05-21  Trent Buck  <trentbuck@gmail.com>  (tiny change)

   * lisp/net/rcirc.el (rcirc-fill-column): Allow `window-width'.
   (rcirc-print): Handle `window-width'.
   (rcirc-buffer-maximum-lines): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-764

1 files changed, 15 insertions, 0 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 0f39e02630c..b3075723e31 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -38,12 +38,27 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
+** eliz@gnu.org, May 20: EOL conversion of files in .tar archives
+
 * BUGS
 
 NB the definitive copy of this file for Emacs 22 is on the
 EMACS_22_BASE branch.  Any entries below are automatically copied from
 that branch.  Do not make manual changes to this file on the trunk.
 
+** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
+
+* FIXES FOR EMACS 22.2
+
+Here we list small fixes that arrived too late for Emacs 22.1, but
+that should be installed on the release branch after 22.1 is released.
+
+** Changes to six pbm icons in etc/images.
+Sync change from trunk 2007-05-19.
+
+** viper and tramp should not load cl at run time.
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.