Commit 698c8370 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--rel--22

Patches applied:

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

   - Update from CVS

2007-05-21  Trent Buck  <>  (tiny change)

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

parents e6377969 d51f146b
......@@ -38,12 +38,27 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
** 09 Aug 2006: ispell.el problem on Cygwin.
(Did we decide that is unreproducible?)
**, May 20: EOL conversion of files in .tar archives
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.
**, Apr 24: 22.0.98 not starting on Solaris 10/I386
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.
** Check the Emacs Tutorial.
......@@ -144,6 +144,21 @@ Reportedly this patch in X fixes the problem.
return ret;
** Emacs crashes on startup after a glibc upgrade.
This is caused by a binary incompatible change to the malloc
implementation in glibc 2.5.90-22. As a result, Emacs binaries built
using prior versions of glibc crash when run under 2.5.90-22.
This problem was first seen in pre-release versions of Fedora 7, and
may be fixed in the final Fedora 7 release. To stop the crash from
happening, first try upgrading to the newest version of glibc; if this
does not work, rebuild Emacs with the same version of glibc that you
will run it under. For details, see
* Crash bugs
** Emacs crashes in x-popup-dialog.
......@@ -3,6 +3,12 @@
* mail/mail-extr.el (mail-extract-address-components): Recognize
non-ASCII characters except for NBSP as words.
2007-05-21 Trent Buck <> (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 <>
* image-mode.el (image-toggle-display): Don't clear image cache.
......@@ -95,9 +95,11 @@ Each element looks like (SERVER-REGEXP . CHANNEL-LIST)."
(defcustom rcirc-fill-column nil
"*Column beyond which automatic line-wrapping should happen.
If nil, use value of `fill-column'. If 'frame-width, use the
maximum frame width."
If nil, use value of `fill-column'.
If `window-width', use the window's width as maximum.
If `frame-width', use the frame's width as maximum."
:type '(choice (const :tag "Value of `fill-column'")
(const :tag "Full window width" window-width)
(const :tag "Full frame width" frame-width)
(integer :tag "Number of columns"))
:group 'rcirc)
......@@ -143,8 +145,7 @@ number. If zero or nil, no truncating is done."
:group 'rcirc)
(defcustom rcirc-scroll-show-maximum-output t
"*If non-nil, scroll buffer to keep the point at the bottom of
the window."
"*If non-nil, scroll buffer to keep the point at the bottom of the window."
:type 'boolean
:group 'rcirc)
......@@ -1245,6 +1246,8 @@ record activity."
(make-string (- text-start fill-start) ?\s)))
(fill-column (cond ((eq rcirc-fill-column 'frame-width)
(1- (frame-width)))
((eq rcirc-fill-column 'window-width)
(1- (window-width)))
(t fill-column))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment