Mercurial > emacs

changeset 77769:4e1d9d19df5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(rcirc-fill-column): Allow `window-width'. (rcirc-print): Handle `window-width'. (rcirc-buffer-maximum-lines): Doc fix.
author Richard M. Stallman <rms@gnu.org>
date Mon, 21 May 2007 19:38:52 +0000
parents ba90c7335cf7
children 61e337029c36
files lisp/net/rcirc.el
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/net/rcirc.el	Mon May 21 15:39:45 2007 +0000
+++ b/lisp/net/rcirc.el	Mon May 21 19:38:52 2007 +0000
@@ -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))))