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

diff --cc admin/FOR-RELEASE
index 0f39e02630ca509c1a41c560636d45d6c47568cd,b999cab66745498110d32a5324ec0470c95d3cfd..b3075723e313715c66711a077760dfedcce6afb1
--- 1/admin/FOR-RELEASE
--- 2/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@@ -38,12 -34,23 +38,27 @@@ to the hack introduced on 2005-07-01 t
  ** 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.

diff --cc lisp/ChangeLog
index 3d12cb346be67b338d4179f5ba22443760b58f4f,53e45ef70d9263e342c895f955d319e3746ad910..e7d15008676ee4b6de5002bbc0ffdfe248d1eb4d
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,52 -1,12 +1,58 @@@
 +2007-05-22  Katsumi Yamaoka  <yamaoka@jpl.org>  (tiny change)
 +
 +      * mail/mail-extr.el (mail-extract-address-components): Recognize
 +      non-ASCII characters except for NBSP as words.
 +
+ 2007-05-21  Trent Buck  <trentbuck@gmail.com>  (tiny change)
+ 
+       * net/rcirc.el (rcirc-fill-column): Allow `window-width'.
+       (rcirc-print): Handle `window-width'.
+       (rcirc-buffer-maximum-lines): Doc fix.
+ 
 +2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * image-mode.el (image-toggle-display): Don't clear image cache.
 +      Only use filename in image spec if the file is readable.  Call
 +      image-refresh.
 +
 +      * image.el (image-type-from-file-name, image-type): Simplify.
 +      (image-type-auto-detected-p): Don't scan auto-mode-alist.
 +
 +      * files.el (magic-mode-alist): Remove image-type-auto-detected-p.
 +      (magic-fallback-mode-alist): Add image-type-auto-detected-p.
 +
 +2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 +
 +      * t-mouse.el (t-mouse-mode): Reset t-mouse-mode to nil if there
 +      is an error.
 +
 +      * term/linux.el (terminal-init-linux): Don't signal an error
 +      if gpm isn't running.
 +
 +2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 +
 +      * t-mouse.el: Reduce to a minor-mode macro call.
 +      (t-mouse-mode) Remove the lighter.
 +
 +      * term/linux.el (terminal-init-linux): Enable t-mouse by default.
 +
 +2007-05-19  Dan Nicolaescu  <dann@ics.uci.edu>
 +
 +      * files.el (auto-mode-alist): Change the regexp so that
 +      ChangeLog.unicode and ChangeLog.multi-tty use change-log-mode.
 +
 +2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * paren.el (show-paren-function): Undo 2007-04-19 and 2007-04-20
 +      changes.
 +
  2007-05-19  Kevin Ryde  <user42@zip.com.au>
  
 -      * info.el (Info-fontify-node): Match https also.
 +      * info.el (Info-fontify-node): Fontify https as well as http and ftp.
 +
 +2007-05-18  Thien-Thi Nguyen  <ttn@gnuvola.org>
 +
 +      * textmodes/sgml-mode.el: Revert last change.
  
  2007-05-18  Richard Stallman  <rms@gnu.org>