[Emacs-diffs] Changes to emacs/lisp/net/rcirc.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/05/22 05:55:08

Index: lisp/net/rcirc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- lisp/net/rcirc.el   7 May 2007 01:09:35 -0000       1.33
+++ lisp/net/rcirc.el   22 May 2007 05:55:05 -0000      1.34
@@ -95,9 +95,11 @@
 
 (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 @@
   :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 @@
                           (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)))
                                         (rcirc-fill-column
                                          rcirc-fill-column)
                                         (t fill-column))))